Merge branch 'jc/merge-reduce-parents-early'

diff --git a/t/t5541-http-push.sh b/t/t5541-http-push.sh
index d7964c7eb523ce95944d559e6123df4c2b6d3934..5b170be2c0a8a97b5d7a0bc1a980afa4da9c40bd 100755 (executable)
--- a/t/t5541-http-push.sh
+++ b/t/t5541-http-push.sh
@@ -168,7 +168,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
 '
 
 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" \
+       test_i18ngrep "Updates were rejected because" \
                output
 '