Merge branch 'mz/maint-rename-unmerged' into maint

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index b8cf2603a195af406d3606712e45fd1195c1588f..7be2ff38fc92088d4caff9ea13b1d78a1b040b40 100755 (executable)
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -423,7 +423,7 @@ Unstaged changes after reset:
 M      file2
 EOF
 
-test_expect_success '--mixed refreshes the index' '
+test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
        echo 123 >> file2 &&
        git reset --mixed HEAD > output &&
        test_cmp expect output