Merge branch 'ab/detox-gettext-tests'

[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 13859ec8595f7f5abc32cc5322e83328a4556319..a9c816b47f269ad0bf073f97f50e03a6ba3890d7 100755 (executable)
--- 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
@@ -84,7 +84,7 @@ test_expect_success 'merge reduces irrelevant remote heads' '
                rm expected.tmp
        fi &&
        GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-       test_i18ncmp expected actual
+       test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -101,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