Thread (13 messages) flat view 13 messages, 7 authors, 2016-06-15

Re: Mergetool generating blank files (1.5.3)

From: Jeff King <hidden>
Date: 2016-06-15 22:43:37

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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help