I use vimdiff and occasionally kdiff3 for git merging. what I really like meld for is merging two directory trees (e.g. reconciling two forks of the same code),

I use vimdiff and occasionally kdiff3 for git merging. what I really like meld for is merging two directory trees (e.g. reconciling two forks of the same code), they have the best tree diff ux of any of the common tools I've tried.