Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented

Jakub Narebski [off-list ref] writes:

Junio C Hamano wrote:

quoted

+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"

I took this from "diff3 -m" format, fwiw.