On Fri, Oct 23, 2020 at 9:01 AM Elijah Newren via GitGitGadget <gitgitgadget@xxxxxxxxx> wrote: > > diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh > index 6abe441ae3..b205b5619e 100755 > --- a/t/t7602-merge-octopus-many.sh > +++ b/t/t7602-merge-octopus-many.sh > @@ -77,6 +77,10 @@ Merge made by the 'recursive' strategy. > EOF > > test_expect_success 'merge reduces irrelevant remote heads' ' > + if test "$GIT_TEST_MERGE_ALGORITHM" = ort > + then > + sed -i'' s/recursive/ort/ expected > + fi && > GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual && > test_i18ncmp expected actual > ' I've got a portability fix for this local hunk that I'll include along with fixes for other feedback. (I could have sworn I had this fixed before I sent it out, but I guess I sent an older version somehow?)
