Merge branch 'maint'

diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh
index a97765314739be68cdd82e0b6f8dadd12f10a0a4..531850d834dfa6f37d104afc12f3d5ddced8bf17 100755 (executable)
--- a/t/t6039-merge-ignorecase.sh
+++ b/t/t6039-merge-ignorecase.sh
@@ -15,7 +15,7 @@ test_expect_success 'merge with case-changing rename' '
        >TestCase &&
        git add TestCase &&
        git commit -m "add TestCase" &&
-       git tag baseline
+       git tag baseline &&
        git checkout -b with-camel &&
        >foo &&
        git add foo &&