Merge branch 'maint-1.6.0' into maint

diff --git a/t/t7604-merge-custom-message.sh b/t/t7604-merge-custom-message.sh
index de977c5e2f0b270c57bbea9daaf8e22eefdf8560..269cfdf267443f67ef8c6c921610bc856f4e506b 100755 (executable)
--- a/t/t7604-merge-custom-message.sh
+++ b/t/t7604-merge-custom-message.sh
@@ -22,15 +22,12 @@ test_expect_success 'setup' '
        git tag c2
 '
 
-cat >expected <<\EOF
-custom message
 
-Merge commit 'c2'
-EOF
 test_expect_success 'merge c2 with a custom message' '
        git reset --hard c1 &&
+       echo >expected "custom message" &&
        git merge -m "custom message" c2 &&
-       git cat-file commit HEAD | sed -e "1,/^$/d" > actual &&
+       git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
        test_cmp expected actual
 '