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

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 6d3ef6c60bd5a26e2ed4d533fc4db7711bb92cfb..833d6cbcfc063f336d97689ae4e547cf5e956b69 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -54,7 +54,7 @@ test_expect_success 'custom pattern' '
 
 test_expect_success 'last regexp must not be negated' '
        git config diff.java.funcname "!static" &&
-       ! git diff --no-index Beer.java Beer-correct.java
+       test_must_fail git diff --no-index Beer.java Beer-correct.java
 '
 
 test_done