X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft6035-merge-dir-to-symlink.sh;h=3202e1de6d01bf3c36e82351c7f8426cc2bb44ab;hb=e8f30160007d976746d880dab73b805435e04149;hp=5b96fb0b37b8397342796fd3b9fec94c91063ba4;hpb=b0e67fffb42059cc5dca6f58c376a2ffc5fb4520;p=git.git

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index 5b96fb0b3..3202e1de6 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -74,7 +74,7 @@ test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
 	git tag test2
 '
 
-test_expect_failure 'merge should not have conflicts (resolve)' '
+test_expect_success 'merge should not have conflicts (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s resolve test2 &&