Merge branch 'en/merge-fixes'

diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index e12cd578e8663ad8717aecde310bb0b6a500c2a2..6b84e6042a6fcc9cf850a53ad2a885597fb178fc 100755 (executable)
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -16,7 +16,7 @@ test_expect_success setup '
        git commit -a -m "A sample commit log message that has a long
 summary that spills over multiple lines.
 
-But otherwise with a sane description."
+But otherwise with a sane description." &&
 
        git branch side &&
 
@@ -32,8 +32,8 @@ test_expect_success rebase '
 
        git checkout side &&
        git rebase master &&
-       git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
-       git cat-file commit side@{1} | sed -e "1,/^$/d" >expect &&
+       git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+       git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
        test_cmp expect actual
 
 '