git-am: Mention --abort in usage string part of OPTIONS_SPEC

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 2ee5a00ea794e31946ee3228bc66ecc8e7d3b38f..0d33c71daa557e68268dfb2279a02fe2afca1ed7 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -31,12 +31,11 @@ test_expect_success setup '
        git branch skip-merge skip-reference
        '
 
-test_expect_failure 'rebase with git am -3 (default)' '
-       git rebase master
+test_expect_success 'rebase with git am -3 (default)' '
+       test_must_fail git rebase master
 '
 
 test_expect_success 'rebase --skip with am -3' '
-       git reset --hard HEAD &&
        git rebase --skip
        '
 
@@ -44,7 +43,7 @@ test_expect_success 'rebase moves back to skip-reference' '
        test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
        git branch post-rebase &&
        git reset --hard pre-rebase &&
-       ! git rebase master &&
+       test_must_fail git rebase master &&
        echo "hello" > hello &&
        git add hello &&
        git rebase --continue &&
@@ -54,10 +53,11 @@ test_expect_success 'rebase moves back to skip-reference' '
 
 test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
 
-test_expect_failure 'rebase with --merge' 'git rebase --merge master'
+test_expect_success 'rebase with --merge' '
+       test_must_fail git rebase --merge master
+'
 
 test_expect_success 'rebase --skip with --merge' '
-       git reset --hard HEAD &&
        git rebase --skip
        '