meld: Meld (PyGTK Visual Diff and Merge Tool)
meld:
meld: Meld is a  visual  diff  and  merge  tool.  You can  compare two or three
meld: files and edit them  in place (diffs update dynamically). You can compare
meld: two or three folders and launch file comparisons. You can browse and view
meld: a working copy from  popular  version  control  systems  such such as CVS
meld: Subversion, Bazaar-ng and Mercurial.
meld:
meld:
meld:
meld: