Merge branch 'jc/ll-merge-binary-ours'

diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 7a3e1f9a24e4be3759c29acc632fc461ede2b74b..3d4b1ba23f9eacec4e1bcd29345cc7d3943badce 100755 (executable)
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -36,24 +36,24 @@ test_expect_success '--stat output after text chmod' '
        test_chmod -x rezrov &&
        echo " 0 files changed" >expect &&
        git diff HEAD --stat >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after text chmod' '
        git diff HEAD --shortstat >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success '--stat output after binary chmod' '
        test_chmod +x binbin &&
        echo " 0 files changed" >expect &&
        git diff HEAD --stat >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_expect_success '--shortstat output after binary chmod' '
        git diff HEAD --shortstat >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_done