Meld

Description

Meld is a visual diff and merge tool targeted at developers. Meld helps you to compare files, directories, and version controlled projects. It provides two- and three-way comparison of both files and directories. Meld can be downloaded on http://meldmerge.org.

Installation

Meld is a free computer program for Linux and other Unix-like platforms. If you want to get Meld running on Windows you have to install the dependencies Python, PyGTK and Cygwin. Further information can be found on https://live.gnome.org/Meld/Windows.

Configuration

On Windows files are saved with the line ending CR+LF (carriage return + line feed) by default. If you want to save files with the line ending LF (line feed) you have to follow the instructions on http://git.gnome.org/browse/meld/commit/?id=74a9e35678b78cf377ac01881b21d016c9e968c9.