Merge branch 'jn/format-patch-doc'

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index b8cf2603a195af406d3606712e45fd1195c1588f..f1cfc9ac959ee281d50f7b8a51fdcefd2d0670e7 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -426,7 +426,7 @@ EOF
 test_expect_success '--mixed refreshes the index' '
        echo 123 >> file2 &&
        git reset --mixed HEAD > output &&
-       test_cmp expect output
+       test_i18ncmp expect output
 '
 
 test_expect_success 'disambiguation (1)' '