[kelahcim]

Sublime Merge (when it comes to git integration) is the best choice now - at least for me.

Meld, on the other hand, is the best tool for comparing local copies and directories.