From: Ævar Arnfjörð Bjarmason Date: Tue, 27 Jul 2010 16:54:58 +0000 (+0000) Subject: t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test X-Git-Tag: v1.7.3-rc0~30^2~5 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2fd1ea14056cb630bbf99588b78d7d68f51907ce;p=git.git 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 --- diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index f6972bed0..40c4f4a9b 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -72,7 +72,7 @@ test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolv test -f a/b-2/c/d ' -test_expect_failure 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' ' +test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' ' git reset --hard && git checkout master^0 && git merge -s recursive baseline^0 &&