From: Kevin Bracey <kevin@bracey.fi>
Date: Thu, 14 Mar 2013 17:39:28 GMT
Subject: Re: [PATCH v3 3/3] git-merge-one-file: revise merge error reporting
Message-ID: <51420B50.2030600@bracey.fi>
In-Reply-To: <5142097B.1080105@bracey.fi>

On 14/03/2013 19:31, Kevin Bracey wrote:
> On 14/03/2013 16:56, Junio C Hamano wrote:
>>
> Well, yes, but I would assume that we would forcibly select normal 
> diff here somehow, if we aren't already. We should be - turning 
> ABCDEFGH vs ABCD into ABCD<EFGH|EFGH=> is silly.

Doh. But anyway, we don't want to waste space with |= markers, and make 
the same "surrounding code is in the base" suggestion. So we should be 
selecting diff.

Kevin