From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] git-merge documentation: describe how conflict is presented
Date: Mon, 01 Sep 2008 03:43:33 -0700 [thread overview]
Message-ID: <7vd4jow3hm.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <g9gg5l$b55$1@ger.gmane.org> (Jakub Narebski's message of "Mon, 01 Sep 2008 12:29:09 +0200")
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.
prev parent reply other threads:[~2008-09-01 10:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-01 6:28 [PATCH 2/2] git-merge documentation: describe how conflict is presented Junio C Hamano
2008-09-01 10:29 ` Jakub Narebski
2008-09-01 10:43 ` Junio C Hamano [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=7vd4jow3hm.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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).