Merge branch 'jc/diff-sane-truncate-no-more' into next

diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index 2062b858bbcb63a715d87f3b12adfd0e9ceb3a67..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 &&