X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6020-merge-df.sh;fp=t%2Ft6020-merge-df.sh;h=eec8f4e3edd85e350f5b8d8c86415317cce2aba1;hb=5acb623b72bde9ec96c48a8bb8f50e61371705ee;hp=b129f1dbd5a5ffe4413ea359f3e893e935117115;hpb=9f6cea97c97ee505bd6771db7df69f04df9b4fc4;p=git.git

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index b129f1dbd..eec8f4e3e 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -24,7 +24,7 @@ test_expect_success 'prepare repository' '
 '
 
 test_expect_success 'Merge with d/f conflicts' '
-	test_must_fail git merge master
+	test_expect_code 1 git merge "merge msg" B master
 '
 
 test_expect_success 'F/D conflict' '