From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
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.lorimer.id.au/gitweb.git/diff_plain/2fd1ea14056cb630bbf99588b78d7d68f51907ce?ds=inline;hp=2fd1ea14056cb630bbf99588b78d7d68f51907ce

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>
---