Junio C Hamano wrote: > +By default, git uses the same style as that is used by "merge" program > +from the RCS suite to present such a conflicted hunk, like this: Actually it is also one of diff3 output format, to be more exact it is format generated by "diff3 -E"/"diff3 --show-overlap" -- 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
