From: Jakub Narebski <jnareb@gmail.com>
To: Andreas Gruenbacher <agruen@suse.de>
Cc: git@vger.kernel.org
Subject: Re: Merge format documented?
Date: Fri, 27 Mar 2009 09:05:31 -0700 (PDT) [thread overview]
Message-ID: <m3y6ur0x4m.fsf@localhost.localdomain> (raw)
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
prev parent reply other threads:[~2009-03-27 16:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 3:19 Merge format documented? Andreas Gruenbacher
2009-03-23 3:50 ` Junio C Hamano
2009-03-23 7:18 ` Andreas Gruenbacher
2009-03-23 7:52 ` Junio C Hamano
2009-03-23 9:17 ` Johannes Sixt
2009-03-27 16:05 ` Jakub Narebski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3y6ur0x4m.fsf@localhost.localdomain \
--to=jnareb@gmail.com \
--cc=agruen@suse.de \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).