Re: git merge no longer handles add/add

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 20, 2007, 01:15 UTC
Message-ID: <Pine.LNX.4.64.0711200114290.27959@racer.site>
In-Reply-To: <fhspor$9ci$1@ger.gmane.org>

Hi,

On Mon, 19 Nov 2007, Jakub Narebski wrote:

Show 10 quoted lines

> Junio C Hamano wrote:
> 
> > Exactly. ?We may keep conflict markers in the file left in the work 
> > tree to highlight which lines are unique to the side that added more 
> > (iow, one group of lines delimited by <<< === >>> is empty while the 
> > other is not) but this is currently treated as "fishy, needs human 
> > validation" to catch mismerges.
> 
> BTW can xdifflib merge use original diff3 conflict markers, i.e. <<< 
> [main] |||| [ancestor] === [branch] >>>?

There was a patch floating around which added git-diff3, just after I went public with my xmerge patch. This seemed to have the code you look for.

Ciao, Dscho

P.S.: I will refuse to reply to you in future whenever you do not Cc: me.