X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6020-merge-df.sh;h=490d3971142a87e940f3d27e7e7f068b276ff602;hb=b9f171cc3b3f7f528acf672b5fef7e95b153213b;hp=e71c687f2b9473842684fae1a1b4b013c721497f;hpb=990169b9b19b2a4e837127c6b8678d6bdf44c609;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 &&