Andrew's git / gitweb.git / diff
?
t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Jul 2010 16:54:58 +0000 (16:54 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Jul 2010 19:51:35 +0000 (12:51 -0700)
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>
No differences found