parse-options: add OPT_NONEG to the "contains" option

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index e36ed3b4e18e22986233f72e016b491c801117db..f286f39b45995a047e3a5882feec390a9ec818cd 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -953,6 +953,10 @@ test_expect_success '--merged catches invalid object names' '
        test_must_fail git branch --merged 0000000000000000000000000000000000000000
 '
 
+test_expect_success '--merged is incompatible with --no-merged' '
+       test_must_fail git branch --merged HEAD --no-merged HEAD
+'
+
 test_expect_success 'tracking with unexpected .fetch refspec' '
        rm -rf a b c d &&
        git init a &&