Graphical tool for merging and comparing text files

Diffuse is a graphical tool for comparing and merging text files.
It can retrieve files for comparison from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, and Subversion repositories.