Merge branch 'jk/mailmap-incomplete-line' into maint

diff --git a/t/t0026-eol-config.sh b/t/t0026-eol-config.sh
index f37ac8fa0b720d1a72536033c3334a6f5244d5d7..fe0164be62ad9ae7a2ea426c6e576cd1133f3d67 100755 (executable)
--- a/t/t0026-eol-config.sh
+++ b/t/t0026-eol-config.sh
@@ -12,7 +12,7 @@ test_expect_success setup '
 
        git config core.autocrlf false &&
 
-       echo "one text" > .gitattributes
+       echo "one text" > .gitattributes &&
 
        for w in Hello world how are you; do echo $w; done >one &&
        for w in I am very very fine thank you; do echo $w; done >two &&