Merge branch 'ab/test-must-be-empty-for-master'

diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh
index 2e28f2908d5571715aeddaa0962bb8adf4e14591..4a71f17edd69a2cb6962cf759aa6ad1b7604c2db 100755 (executable)
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6043-merge-rename-directories.sh
@@ -3583,7 +3583,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
                grep -q stuff z/c &&
                test_seq 1 10 >expected &&
                echo stuff >>expected &&
-               test_cmp expected z/c
+               test_cmp expected z/c &&
 
                git ls-files -s >out &&
                test_line_count = 4 out &&