Merge branch 'bs/userdiff-php'

diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index e12cd578e8663ad8717aecde310bb0b6a500c2a2..2062b858bbcb63a715d87f3b12adfd0e9ceb3a67 100755 (executable)
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -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
 
 '