GNOME visual diff and merge tool (supports cvs and svn diffs and syntax highlighting)