Merge branch 'rj/maint-difftool-cygwin-workaround'

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 5cb7e70d54267b53ffb4b0f4c46875308d9de5a6..d3a3bd2679e061ce391930d2b59831aa7610926f 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -647,6 +647,7 @@ test_expect_success 'rebase -i can copy notes' '
 
 cat >expect <<EOF
 an earlier note
+
 a note
 EOF