Merge branch 'jc/combine-diff-callback'

diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 3f24384371bf227126e38da61f3b7efd3961ede8..b8996a373a7444b54823f36159ea1a8634e4aeee 100644 (file)
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -158,7 +158,6 @@ test_http_push_nonff() {
        '
 
        test_expect_success 'non-fast-forward push shows help message' '
-               grep "To prevent you from losing history, non-fast-forward updates were rejected" \
-                       output
+               test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output
        '
 }