From: Jakub Narebski <jnareb@gmail.com>
Date: Fri, 27 Mar 2009 16:05:31 GMT
Subject: Re: Merge format documented?
Message-ID: <m3y6ur0x4m.fsf@localhost.localdomain>
In-Reply-To: <200903230419.50000.agruen@suse.de>

Andreas Gruenbacher <agruen@suse.de> writes:

> Hello,
> 
> is the format that git normally uses for indicating merge conflicts in files 
> (the <<< === >>> markers) documented somewhere?  How exactly does it differ 
> from the diff3 format (<<< ||| === >>>)?  Diff3's -m mode seems to come close 
> to what git does, except that git doesn't produce the ||| section:

It is rcmerge / merge from RCS / CVS output format (and I think it is
also format used for other VCS), and IIRC it is equivalent to "diff3
-E" format

> Does git ever output a ||| section?

You can ask for it with merge.conflictstyle configuration variable, or
--conflict=<style> option to git-checkout.

-- 
Jakub Narebski
Poland
ShadeHawk on #git