From: Junio C Hamano <gitster@pobox.com>
To: Andreas Gruenbacher <agruen@suse.de>
Cc: git@vger.kernel.org
Subject: Re: Merge format documented?
Date: Sun, 22 Mar 2009 20:50:24 -0700 [thread overview]
Message-ID: <7vtz5k99tr.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200903230419.50000.agruen@suse.de> (Andreas Gruenbacher's message of "Mon, 23 Mar 2009 04:19:49 +0100")
Andreas Gruenbacher <agruen@suse.de> writes:
> 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 an imitation of output from "merge" program of RCS suite Paul you
know maintains ;-) Recent versions of git supports merge.conflictstyle
configuration variable and --conflict option in 'git-checkout' to write
the conflicts out in a format that is an imitation of "diff3 -m" output.
As far as I know, neither "git" format is documented anywhere, but I
didn't find an official format specification of the "upstream" formats,
and that is why I keep saying "imitation" in the above paragraph ;-)
next prev parent reply other threads:[~2009-03-23 3:52 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 [this message]
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
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=7vtz5k99tr.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.