X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=t%2Ft6020-merge-df.sh;h=490d3971142a87e940f3d27e7e7f068b276ff602;hb=38a18873b21f6f2eebedc65aff2249fd6ec2168c;hp=e71c687f2b9473842684fae1a1b4b013c721497f;hpb=796a01c41ca0b66f798571c7e876b3de4607f498;p=git.git

diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
index e71c687f2..490d39711 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6020-merge-df.sh
@@ -22,7 +22,7 @@ git commit -m "File: dir"'
 
 test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
 
-test_expect_failure 'F/D conflict' '
+test_expect_success 'F/D conflict' '
 	git reset --hard &&
 	git checkout master &&
 	rm .git/index &&