Hi, Thanks for the thorough reviews! On Wed, Jul 7, 2010 at 3:25 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> -test_expect_failure 'do not lose a/b-2/c/d in merge (recursive)' ' >> +test_expect_failure 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' ' > > If you retitle this, you would probably want to retitle the corresponding > test for resolve (the one before this test) the same way. <snip> > It may be a good idea to see what resolve does for all these new > tests. I'd be happy to make these and the other changes you suggested, but I notice that you've already done so in pu with Fixup commits for this and the other patches. Should I squash those in for a resend of the series? Also, do you want me to split the series as you did with the testsuite addition patches separate from the fixes? Thanks, Elijah -- 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