Merge branch 'mg/merge-ff-config'

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index 4b93fa1264a13c7864706b3234e563c122362cc8..a73c82635ff6fba6fcef4f139ff09205c1b9b6de 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -137,8 +137,8 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
        grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
 '
 
-test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
-       grep "To prevent you from losing history, non-fast-forward updates were rejected" \
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
+       test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
                output
 '