Meld helps you review code changes and understand patches. It might even help you to figure out what is going on in that merge you keep avoiding.
- Two- and three-way comparison of files and directories
- File comparisons update as you type
- Auto-merge mode and actions on change blocks help make merges easier
- Visualisations make it easier to compare your files
- Supports Git, Bazaar, Mercurial, Subversion, etc.
- and more...
Installation into Linux Mint 15/16/17/17.1/17.2:
sudo apt-get install meld
Installation Meld 3.14.0 into Linux Mint 15/16/17/17.1/17.2:
cd /tmp; wget http://archive.ubuntu.com/ubuntu/pool/universe/m/meld/meld_3.14.0-1_all.deb; sudo dpkg -i meld_3.14.0-1_all.deb sudo apt-get -f install
Integration Meld into a text editor (Gedit) for easier comparison (The decision taken from webupd8.org):
In Gedit, go to Edit > Preferences and on the "Plugins" tab, enable the "External tools" plugin. Then click "Configure Plugin", add a new external tool (the "+" button), give it a name like "Compare with Meld", additionally set a keyboard shortcut for it and under the "Edit" field, enter this:
Now whenever you press the keyboard shortcut you've set above or go to Tools > External Tools > Compare with Meld (or whatever name you've set for the custom external tool), a Zenity window will popup letting you browse for a file to compare with the currently active file in Gedit.