[neves]

Sorry, Meld is nice, but if you use version control you are handicapped if not using a 3 way diff program.

I never found one with features good enough to make me change from Kdiff3.

[ubercow13]

Meld is a 3 way merge tool.