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

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

--=20
=C2=B7O=C2=B7  Pierre Habouzit
=C2=B7=C2=B7O                                                madcoder@debia=
n.org
OOO                                                http://www.madism.org