Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Written with Python and GTK. Requirements: Python 2.6 GTK+/pygtk 2.14 GLib/pygobject 2.16 GtkSourceView/pygtksourceview 2.
- Cannot be added to context menu. Sometimes folder comparison doesn't work. Says empty folder.
- Free, but doesn't do picture and hexadecimal.