Hi, On Thu, Aug 11, 2011 at 11:48 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Avoiding silent mismerges is of course one of the most important criteria, > but we also need to make sure that a conflicted state left in the index > and the working tree files must not be harder to reconcile than what we > have been giving our users---otherwise the change will be seen as a > regression by them. Yeah, good point. I tried re-running my previous re-merge all merges in git.git testcase, modified so that when both versions of git reported a conflict I would compare the output of 'git ls-files -s'. That uncovered a regression. I think I know the fix but I need to retest and do some more checks. -- 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