t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
Various merge-recursive cases were fixed in "merge-recursive: Fix D/F conflicts" by Elijah Newren. Some tests were changed from test_expect_failure to test_expect_success, but one fell through the cracks. Change that test to use test_expect_success. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Jul 27, 2010 at 16:54 UTC
2fd1ea14056cb630bbf99588b78d7d68f51907ce
1 file changed
+1
-1
t/t6035-merge-dir-to-symlink.sh
+1
-1
@@ -72,7 +72,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv
72
test -f a/b-2/c/d
73
'
74
75
-test_expect_failure 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
75
+test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
76
git reset --hard &&
77
git checkout master^0 &&
78
git merge -s recursive baseline^0 &&