Merge branch 'maint'

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 3bd74042ef46ee8b4e4477d1c23ba0914963de33..d78bdec330cd8b9505aa92ff2e81e0f716b9a741 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -54,7 +54,7 @@ test_expect_success 'custom mergetool' '
 
 test_expect_success 'mergetool crlf' '
     git config core.autocrlf true &&
-    git checkout -b test2 branch1
+    git checkout -b test2 branch1 &&
     test_must_fail git merge master >/dev/null 2>&1 &&
     ( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
     ( yes "" | git mergetool file2 >/dev/null 2>&1 ) &&