On Fri, Sep 28, 2007 at 05:15:03AM +0000, Peter Baumann wrote: > FWIW, xxdiff has support to handle halfway merged files, so that if git > could merge some hunks already for you (e.g. rerere kicked in), you > don't have to redo the _whole_ merge by hand, just call > > xxdiff -U file/with/mergemarkers/inside > > and it will do the right thing. Not sure if the other tools could handle > it, but any pointers appreciated, because it often happens to me that > only one hunk out of several wasn't merged automatically by git. And > mergetool wants to always redo the whole merge, which isn't the best it > can do. For what I've seen, it's how meld works, and I find it nice too. Meld is quite slow (python + gnomeish doesn't help) but well, I don't merge things that often, so like said I think I'll give it a try for a while and see if it has what it takes :) -- ·O· Pierre Habouzit ··O madcoder@xxxxxxxxxx OOO http://www.madism.org
Attachment:
pgpY5M0UmikDS.pgp
Description: PGP signature
