Hi, On Tue, Jul 27, 2010 at 10:54 AM, Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> 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. :-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html