Hi, On Mon, 19 Nov 2007, Jakub Narebski wrote: > 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. - 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
