From: Tupshin Harper <tupshin@tupshin.com>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Bram Cohen <bram@bitconjurer.org>, git@vger.kernel.org
Subject: Re: The criss-cross merge case
Date: Wed, 27 Apr 2005 17:43:00 -0700 [thread overview]
Message-ID: <42703194.80409@tupshin.com> (raw)
In-Reply-To: <Pine.LNX.4.21.0504271854240.30848-100000@iabervon.org>
Daniel Barkalow wrote:
>I've been looking at Darcs (which seems to have a good method, although I
>think the underlying diff isn't great), and Codeville still doesn't have
>any documentation. Arch's method is strictly weaker than 3-way merge, and
>generates more rejects (not even conflicts) in my experience than even
>CVS.
>
> -Daniel
>
>
Can you clarify what you mean by darcs' underlying diff not being that
great? It seems to function pretty much identically to gnu diff. In what
way would you want the underlying diff to be improved?
-Tupshin
next prev parent reply other threads:[~2005-04-28 0:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-27 20:25 The criss-cross merge case Bram Cohen
2005-04-27 23:32 ` Daniel Barkalow
2005-04-28 0:43 ` Tupshin Harper [this message]
2005-04-28 1:16 ` Daniel Barkalow
2005-04-28 2:15 ` Benedikt Schmidt
2005-04-28 2:19 ` Daniel Barkalow
2005-04-28 11:16 ` David Roundy
2005-04-28 3:41 ` suffix array/tree deltas (Was: The criss-cross merge case) Zed A. Shaw
2005-04-28 4:30 ` Daniel Barkalow
-- strict thread matches above, loose matches on Subject: below --
2005-04-28 14:25 The criss-cross merge case Adam J. Richter
2005-04-29 12:19 ` Wayne Scott
2005-04-30 12:32 Adam J. Richter
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=42703194.80409@tupshin.com \
--to=tupshin@tupshin.com \
--cc=barkalow@iabervon.org \
--cc=bram@bitconjurer.org \
--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).