merge tests: expect slight differences in output for recursive vs. ort

[thirdparty/git.git] / t / t7602-merge-octopus-many.sh

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 6abe441ae3611906143a76ac2b4acca7ab5ff671..13859ec8595f7f5abc32cc5322e83328a4556319 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -77,6 +77,12 @@ Merge made by the 'recursive' strategy.
 EOF
 
 test_expect_success 'merge reduces irrelevant remote heads' '
+       if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+       then
+               mv expected expected.tmp &&
+               sed s/recursive/ort/ expected.tmp >expected &&
+               rm expected.tmp
+       fi &&
        GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
        test_i18ncmp expected actual
 '