From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH 2/2 - RFH/WIP] xdiff-merge: optionally show conflicts in "diff3 -m" style
Date: Thu, 28 Aug 2008 18:07:01 -0700 [thread overview]
Message-ID: <7vmyiwbpe2.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.1.10.0808281727490.3300@nehalem.linux-foundation.org> (Linus Torvalds's message of "Thu, 28 Aug 2008 17:34:36 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> On Thu, 28 Aug 2008, Junio C Hamano wrote:
>>
>> Some poeple find it easier to be able to understand what is going on when
>> they can view the common ancestor's version, which is used by "diff3 -m",
>> which shows:
>>
>> <<<<<<<
>> postimage from one side;
>> |||||||
>> shared preimage;
>> =======
>> postimage of the other side; and
>> >>>>>>>
>>
>> This is an initial step to bring that as an optional feature to git.
>> Only "git merge-file" has been converted, with "--diff3" option.
>
> If you have the common ancestor, why would you ever want this format, and
> not a nice conflict entry in the index?
We already have that, don't we? You can think of it as how to present
that information without resorting to "diff :1:path :2:path".
> Anyway, that's irrelevant for my real question, which is:
... the same thing as I already said after three-dashes, hence RFH/WIP.
next prev parent reply other threads:[~2008-08-29 1:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-29 0:09 [PATCH 1/2] xdl_fill_merge_buffer(): separate out a too deeply nested function Junio C Hamano
2008-08-29 0:18 ` [PATCH 2/2 - RFH/WIP] xdiff-merge: optionally show conflicts in "diff3 -m" style Junio C Hamano
2008-08-29 0:34 ` Linus Torvalds
2008-08-29 1:07 ` Junio C Hamano [this message]
2008-08-31 7:10 ` Junio C Hamano
2008-08-31 17:38 ` Linus Torvalds
2008-08-31 18:42 ` Junio C Hamano
2008-08-29 6:27 ` Junio C Hamano
2008-08-29 9:01 ` Junio C Hamano
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=7vmyiwbpe2.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.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).