merge: backport GIT_MERGE_AUTOEDIT support

[git.git] / t / t6024-recursive-merge.sh

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index b3fbf659c003acbed785558c21950046b8caced8..755d30ce2a5d1c5e34751d8906ad41b02d553b03 100755 (executable)
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -104,7 +104,7 @@ test_expect_success 'mark rename/delete as unmerged' '
        test_tick &&
        git commit -m delete &&
        git checkout -b rename HEAD^ &&
-       git mv a1 a2
+       git mv a1 a2 &&
        test_tick &&
        git commit -m rename &&
        test_must_fail git merge delete &&