Meld is a visual diff and merge tool. Meld project integrates especially well with CVS. The diff viewer lets you edit files in place (diffs update dynamically), and a middle column shows detailed changes and allows merges.
The margins show location of changes for easy navigation, and it also features a tabbed interface that allows you to open many diffs at once.
Look at the screenshots page for more detailed features.
Installation
Install the gnome-python modules
If your platform does not supply the gnome-python packages, you can install them from source. It is assumed that you have gnome2 and python2.2 development packages installed.
Download and install pyorbit pygtk gnome-python from your favourite gnome mirror.
You will need to both build and install them to the same $prefix and in that order. This is a gnome-python limitation.
Be careful to watch for messages like 'libfoo-2.0.pc not found' when running configure - you may need to install extra gnome development packages to correctly build.
Install intltool (optional)
Meld uses intltool to generate translations. You can skip this step if you always want to run meld in english.
Install meld
Untar meld.tgz, run "make" to build the translations (optional) and run "./meld"
Product's homepage
Requirements:
· gnome2 libs
· python2.2 or python2.3
· pyorbit-1.99.6 pygtk-1.99.17 gnome-python-1.99.17 or higher
What's New in This Release: [ read full changelog ]
New features:
· Add simple animations for chunk actions to make it easier to follow the result of insertion and deletion actions (Kai Willadsen)
· Show the currently displayed page area in the side bars (Kai Willadsen)
Fixes:
· Don't show links between chunks where one of the chunks is completely off-screen, reducing visual clutter (Kai Willadsen)
· Syntax highlighting will now assume that all files in a comparison are of the same type if we can't determine otherwise (Kai Willadsen)
· Some fixes to colour usage and legibility for dark themes, with more theme fixes coming soon (Kai Willadsen)
· Remember active filters across sessions in directory and VC comparions (Kai Willadsen)
· Guess which version control system a user is most likely to want to see, in the event of multiple VCs in a single working copy (Kai Willadsen)
· Work with Subversion 1.7 (Kai Willadsen)
· Many sundry bug fixes (Aaron Schrab, Julian Taylor, Kai Willadsen)
Translation updates:
· Bruno Brouard (fr)
· Christian Kirbach (de)
· Daniel Mustieles (es)
· Fran Dieguez (gl)
· Gabriel Speckhahn (pt_BR)
· Jiro Matsuzawa (ja)
· Jorge González (es)
· Marcin Floryan (pl)
· Marek ÄŒernocký (cs)
· Mario Blättermann (de)
· Matej UrbanÄiÄ (sl)
· Petr Kovar (cs)
· Piotr DrÄ…g (pl)
· Takeshi AIHANA (ja)
· Yuri Myasoedov (ru)