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

diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 44228b5ac12f5df9d6def93dc74e3687ba2d8e73..c1cec553060a2fd6a4d27191a866b3bf53ba3335 100755 (executable)
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -37,7 +37,7 @@ test_expect_success 'dumb should error out when falling back on vi' '
        if git commit --amend
        then
                echo "Oops?"
-               exit 1
+               false
        else
                : happy
        fi