Merge branch 'jk/combine-diff-binary-etc'

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 234a94f3e6311c529b5bb476ee5a6a2ea705017f..1a8f44c44ca3cce70990ec56fec61894be9b3086 100755 (executable)
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -439,7 +439,7 @@ test_expect_success 'checkout when deleting .gitattributes' '
        git rm .gitattributes &&
        echo "contentsQ" | q_to_cr > .file2 &&
        git add .file2 &&
-       git commit -m third
+       git commit -m third &&
 
        git checkout master~1 &&
        git checkout master &&