From: Elijah Newren <newren@gmail.com>
Date: Fri, 12 Aug 2011 21:59:30 GMT
Subject: Re: [PATCHv2 00/57] Re-roll of en/merge-recursive from pu
Message-ID: <CABPp-BE_cqtOBC_0tsy1nSOfH1XPGM0vdv9fHWp38Q0GBr7OhQ@mail.gmail.com>
In-Reply-To: <7vei0rnprt.fsf@alter.siamese.dyndns.org>

Hi,

On Thu, Aug 11, 2011 at 11:48 PM, Junio C Hamano <gitster@pobox.com> 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.