Hi Elijah, On Wed, 5 Jan 2022, Elijah Newren via GitGitGadget wrote: > diff --git a/t/t4301-merge-tree-real.sh b/t/t4301-merge-tree-real.sh > index f7aa310f8c1..5f3f27f504d 100755 > --- a/t/t4301-merge-tree-real.sh > +++ b/t/t4301-merge-tree-real.sh > @@ -78,4 +78,22 @@ test_expect_success 'Barf on too many arguments' ' > grep "^usage: git merge-tree" expect > ' > > +test_expect_success '--messages gives us the conflict notices and such' ' > + test_must_fail git merge-tree --real --messages=MSG_FILE side1 side2 && Since we discern between exit status 1 (= merge conflict) and >1 (fatal error), we should probably use `test_expect_code` here. Other than that, this patch looks good. Thank you, Dscho > + > + # Expected results: > + # "greeting" should merge with conflicts > + # "numbers" should merge cleanly > + # "whatever" has *both* a modify/delete and a file/directory conflict > + cat <<-EOF >expect && > + Auto-merging greeting > + CONFLICT (content): Merge conflict in greeting > + Auto-merging numbers > + CONFLICT (file/directory): directory in the way of whatever from side1; moving it to whatever~side1 instead. > + CONFLICT (modify/delete): whatever~side1 deleted in side2 and modified in side1. Version side1 of whatever~side1 left in tree. > + EOF > + > + test_cmp expect MSG_FILE > +' > + > test_done > -- > gitgitgadget > >
