diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-07-27 16:54:58 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-07-27 12:51:35 -0700 |
| commit | 2fd1ea14056cb630bbf99588b78d7d68f51907ce (patch) | |
| tree | 75e6d985413e87501bdde42fcf05f78547ddcce0 /t/t5100/nul-plain | |
| parent | fast-import: Improve robustness when D->F changes provided in wrong order (diff) | |
| download | tgif-2fd1ea14056cb630bbf99588b78d7d68f51907ce.tar.xz | |
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>
Diffstat (limited to 't/t5100/nul-plain')
0 files changed, 0 insertions, 0 deletions