diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 682139c4ea..2ebda509ac 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -154,6 +154,8 @@ test_expect_success 'test option parsing' ' test_must_fail git merge -s foobar c1 && test_must_fail git merge -s=foobar c1 && test_must_fail git merge -m && + test_must_fail git merge --abort foobar && + test_must_fail git merge --abort --quiet && test_must_fail git merge --continue foobar && test_must_fail git merge --continue --quiet && test_must_fail git merge |