Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

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