From: Jeff King <peff@peff.net>
Date: Thu, 27 Sep 2007 19:12:01 GMT
Subject: Re: Mergetool generating blank files (1.5.3)
Message-ID: <20070927191201.GA31807@sigill.intra.peff.net>
In-Reply-To: <20070927185707.GC12427@artemis.corp>

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.

-Peff