From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git merge no longer handles add/add
Date: Tue, 20 Nov 2007 01:15:38 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0711200114290.27959@racer.site> (raw)
In-Reply-To: <fhspor$9ci$1@ger.gmane.org>
Hi,
On Mon, 19 Nov 2007, Jakub Narebski wrote:
> Junio C Hamano wrote:
>
> > Exactly. ?We may keep conflict markers in the file left in the work
> > tree to highlight which lines are unique to the side that added more
> > (iow, one group of lines delimited by <<< === >>> is empty while the
> > other is not) but this is currently treated as "fishy, needs human
> > validation" to catch mismerges.
>
> BTW can xdifflib merge use original diff3 conflict markers, i.e. <<<
> [main] |||| [ancestor] === [branch] >>>?
There was a patch floating around which added git-diff3, just after I went
public with my xmerge patch. This seemed to have the code you look for.
Ciao,
Dscho
P.S.: I will refuse to reply to you in future whenever you do not Cc: me.
prev parent reply other threads:[~2007-11-20 1:17 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-19 3:18 git merge no longer handles add/add Martin Langhoff
2007-11-19 3:29 ` Martin Langhoff
2007-11-19 6:43 ` Junio C Hamano
2007-11-19 18:33 ` Martin Langhoff
2007-11-19 18:46 ` J. Bruce Fields
2007-11-19 19:25 ` Junio C Hamano
2007-11-19 19:56 ` Jakub Narebski
2007-11-20 1:15 ` Johannes Schindelin [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=Pine.LNX.4.64.0711200114290.27959@racer.site \
--to=johannes.schindelin@gmx.de \
--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).