From: Elijah Newren Date: Tue, 27 Jul 2010 23:08:32 GMT Subject: Re: [PATCH] t/t6035-merge-dir-to-symlink.sh: Remove TODO on passing test Message-ID: In-Reply-To: <1280249698-11001-1-git-send-email-avarab@gmail.com> Hi, On Tue, Jul 27, 2010 at 10:54 AM, Ævar Arnfjörð Bjarmason wrote: > 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. Weird, I know I tested all of these individually and worked to make sure they all passed; I have no idea how I would have forgotten to update this particular test. Anyway, thanks for cleaning up after me. :-)