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] >>>? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git - 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
