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.
For Mac see http://fink.thetis.ig42.org/ or http://www.macports.org/
For Windows see https://live.gnome.org/Meld/Windows or https://code.google.com/p/meld-installer/
Requirements:
Python 2.6
GTK+/pygtk 2.14
GLib/pygobject 2.16
GtkSourceView/pygtksourceview 2.10 (optional)
↧