From: Jakub Narebski <jnareb@gmail.com>
Date: Mon, 01 Sep 2008 10:29:09 GMT
Subject: Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented
Message-ID: <g9gg5l$b55$1@ger.gmane.org>
In-Reply-To: <7vwshwz8gf.fsf@gitster.siamese.dyndns.org>

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