projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 253fb5f) | patch
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)
commit2fd1ea14056cb630bbf99588b78d7d68f51907ce
tree75e6d985413e87501bdde42fcf05f78547ddcce0tree | snapshot
parent253fb5f8897d988d93ce276f8147c2964da3eefbcommit | diff
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>
t/t6035-merge-dir-to-symlink.sh diff | blob | history
Git—the stupid content tracker