From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Sep 2008 10:43:33 GMT
Subject: Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented
Message-ID: <7vd4jow3hm.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <g9gg5l$b55$1@ger.gmane.org>

Jakub Narebski <jnareb@gmail.com> writes:

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

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