| commit | 2fd1ea14056cb630bbf99588b78d7d68f51907ce | |
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | |
| Tue, 27 Jul 2010 16:54:58 +0000 (27 16:54 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 27 Jul 2010 19:51:35 +0000 (27 12:51 -0700) | ||
| tree | 75e6d985413e87501bdde42fcf05f78547ddcce0 | treesnapshot (tar.gz zip) |
| parent | 253fb5f8897d988d93ce276f8147c2964da3eefb | commitdiff |
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>
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 | diffblobblamehistory |