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 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
