diff options
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
| -rwxr-xr-x | t/t7602-merge-octopus-many.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh index 6abe441ae3..a9c816b47f 100755 --- a/t/t7602-merge-octopus-many.sh +++ b/t/t7602-merge-octopus-many.sh @@ -66,7 +66,7 @@ EOF test_expect_success 'merge output uses pretty names' ' git reset --hard c1 && git merge c2 c3 c4 >actual && - test_i18ncmp expected actual + test_cmp expected actual ' cat >expected <<\EOF @@ -77,8 +77,14 @@ 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 + test_cmp expected actual ' cat >expected <<\EOF @@ -95,7 +101,7 @@ EOF test_expect_success 'merge fast-forward output uses pretty names' ' git reset --hard c0 && git merge c1 c2 >actual && - test_i18ncmp expected actual + test_cmp expected actual ' test_done |