Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index a6d1887536e240e89b8e2263e5f0a643e9a55f71..b41eb61ca8b1e66f618d480a28b2bc14815df2f7 100755 (executable)
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -14,12 +14,12 @@ test_expect_success setup '
        echo a >a &&
        echo b >b &&
        cat >expect <<-\EOF
-        a |    1 +
-        b |    1 +
+        a | 1 +
+        b | 1 +
         2 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_done