Merge branch 'jn/gitweb-js-blame' into next

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 7be2ff38fc92088d4caff9ea13b1d78a1b040b40..f1cfc9ac959ee281d50f7b8a51fdcefd2d0670e7 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -423,10 +423,10 @@ Unstaged changes after reset:
 M      file2
 EOF
 
-test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
+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)' '