Re: Mergetool generating blank files (1.5.3)

From: Pierre Habouzit <madcoder@debian.org>
Date: Sep 27, 2007, 19:16 UTC
Message-ID: <20070927191614.GE12427@artemis.corp>
In-Reply-To: <20070927191201.GA31807@sigill.intra.peff.net>

On Thu, Sep 27, 2007 at 07:12:01PM +0000, Jeff King wrote:

Show 11 quoted lines

> On Thu, Sep 27, 2007 at 08:57:07PM +0200, Pierre Habouzit wrote:
> 
> >   Which tool are you using ? kdiff3 ? I've noticed that it often fails
> > miserably, or worse, create bad merges silentely with it.
> > 
> >   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).
> 
> Huh? I use xxdiff all the time, and it works fine.

  I'm sorry but I find that the UI is terrible.

-- 
·O·  Pierre Habouzit
··O                                                madcoder@debian.org
OOO                                                http://www.madism.org