Merge branch 'jk/rebase-head-reflog'

diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 18269962458248034598d2bb15315f0d2a121027..f67aa6ff6a3c2af2d0c1999e8203da3a922b0555 100755 (executable)
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -123,8 +123,8 @@ cat - >err.expect <<EOF
 warning: tag 'A' is really 'Q' here
 EOF
 check_describe A-* HEAD
-test_expect_success C_LOCALE_OUTPUT 'warning was displayed for Q' '
-       test_cmp err.expect err.actual
+test_expect_success 'warning was displayed for Q' '
+       test_i18ncmp err.expect err.actual
 '
 test_expect_success 'rename tag Q back to A' '
        mv .git/refs/tags/Q .git/refs/tags/A