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=d1b22871c40674582e6999804102afb95283b653;hpb=d539de9f25920f099e4e56b0acbb4ebf246ff0f4;p=git.git

diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh
index d1b22871c..3202e1de6 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6035-merge-dir-to-symlink.sh
@@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' '
 	git tag baseline
 '
 
-test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' '
+test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s resolve master &&