Merge branch 'pw/t5800-import-race-fix'

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 83e917b9180814754f967164d8742b244a1257ae..3b72c097ee0c9538d4e8003639ab7c44126c49d6 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_cmp actual expected
+       test_i18ncmp expected actual
 '
 
 cat >expected <<\EOF
@@ -76,9 +76,9 @@ Merge made by the 'recursive' strategy.
  create mode 100644 c5.c
 EOF
 
-test_expect_failure 'merge reduces irrelevant remote heads' '
+test_expect_success 'merge reduces irrelevant remote heads' '
        GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-       test_cmp expected actual
+       test_i18ncmp expected actual
 '
 
 cat >expected <<\EOF
@@ -95,7 +95,7 @@ EOF
 test_expect_success 'merge fast-forward output uses pretty names' '
        git reset --hard c0 &&
        git merge c1 c2 >actual &&
-       test_cmp actual expected
+       test_i18ncmp expected actual
 '
 
 test_done