Merge branch 'mp/push-pushoption-config'

diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 977472f5390fbe6d1a19c52dd70692ca55dff505..591f35daaf5825cfdcf8e7fccf4f52462bbf8f78 100755 (executable)
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -544,7 +544,7 @@ Signed-off-by: A U Thor
 EOF
 
 unfold () {
-       perl -0pe 's/\n\s+/ /'
+       perl -0pe 's/\n\s+/ /g'
 }
 
 test_expect_success 'set up trailer tests' '