t3407-rebase-abort.sh: Enhance existing tests, and add test for rebase --merge

diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 149ea8543af153d39c8cba8c43bb3436aaaef3b4..23d24d3feb9d1f3b5875771639a8e6d991d5ed76 100755 (executable)
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -81,8 +81,8 @@ EOF
 
 test_expect_success "virtual trees were processed" "git diff expect out"
 
-git reset --hard
 test_expect_success 'refuse to merge binary files' '
+       git reset --hard &&
        printf "\0" > binary-file &&
        git add binary-file &&
        git commit -m binary &&