about summary refs log tree commit diff
path: root/third_party/git/t/t6302-for-each-ref-filter.sh
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/t/t6302-for-each-ref-filter.sh')
-rwxr-xr-xthird_party/git/t/t6302-for-each-ref-filter.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/git/t/t6302-for-each-ref-filter.sh b/third_party/git/t/t6302-for-each-ref-filter.sh
index 35408d53fd..781e470aea 100755
--- a/third_party/git/t/t6302-for-each-ref-filter.sh
+++ b/third_party/git/t/t6302-for-each-ref-filter.sh
@@ -437,8 +437,8 @@ test_expect_success 'check %(if:notequals=<string>)' '
 	test_cmp expect actual
 '
 
-test_expect_success '--merged is incompatible with --no-merged' '
-	test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
+test_expect_success '--merged is compatible with --no-merged' '
+	git for-each-ref --merged HEAD --no-merged HEAD
 '
 
 test_expect_success 'validate worktree atom' '