From: Theodore Tso <tytso@mit.edu>
To: Pierre Habouzit <madcoder@debian.org>,
Russ Brown <pickscrape@gmail.com>, Kelvie Wong <kelvie@ieee.org>,
git@vger.kernel.org
Subject: Re: Mergetool generating blank files (1.5.3)
Date: Thu, 27 Sep 2007 18:23:26 -0400 [thread overview]
Message-ID: <20070927222326.GB8688@thunk.org> (raw)
In-Reply-To: <20070927191125.GD12427@artemis.corp>
On Thu, Sep 27, 2007 at 09:11:25PM +0200, Pierre Habouzit wrote:
> > > And as none of the other merge tool that are supported are able to
> > > either do 3way merges, or have a decent UI (that definitely seems to be
> > > exclusive features) I've given up on git-mergetool (and to be fair, it
> > > sucks, because it could be _sooo_ useful sometimes).
> > >
> >
> > What about meld? That does 3-way merge, and the UI is fine.
>
> Indeed, it seems that since the last time I tested it, it now does
> diff3 merging. I should reevaluate it :)
Pierre,
FYI, kdiff3, meld, xxdiff, opendiff (on MacOSX), and emerge all
support 3-way merge.
- Ted
next prev parent reply other threads:[~2007-09-27 22:23 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-27 18:31 Mergetool generating blank files (1.5.3) Kelvie Wong
2007-09-27 18:57 ` Pierre Habouzit
2007-09-27 19:00 ` Russ Brown
2007-09-27 19:11 ` Pierre Habouzit
2007-09-27 22:23 ` Theodore Tso [this message]
2007-09-27 22:28 ` Pierre Habouzit
2007-09-28 5:15 ` Peter Baumann
2007-09-28 6:35 ` Pierre Habouzit
2007-09-27 19:12 ` Jeff King
2007-09-27 19:16 ` Pierre Habouzit
2007-09-27 19:41 ` Jeff King
2007-09-27 19:24 ` Kelvie Wong
2007-09-27 19:58 ` Junio C Hamano
2007-09-27 20:12 ` Kelvie Wong
2007-09-27 20:28 ` Junio C Hamano
2007-09-27 20:38 ` Kelvie Wong
2007-09-27 20:47 ` Junio C Hamano
2007-09-27 20:51 ` Junio C Hamano
2007-09-27 21:17 ` Kelvie Wong
2007-09-27 21:22 ` Kelvie Wong
2007-09-27 21:33 ` Junio C Hamano
2007-09-27 21:41 ` Junio C Hamano
2007-09-27 22:23 ` Kelvie Wong
2007-09-27 22:52 ` Theodore Tso
2007-09-28 4:17 ` Kelvie Wong
2007-09-28 6:19 ` David Kastrup
2007-09-27 22:35 ` Theodore Tso
2007-09-28 8:43 ` David Kågedal
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=20070927222326.GB8688@thunk.org \
--to=tytso@mit.edu \
--cc=git@vger.kernel.org \
--cc=kelvie@ieee.org \
--cc=madcoder@debian.org \
--cc=pickscrape@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).