Merge and Compare Text Files with Diffuse Software
Diffuse is a free and open source text merger application for Linux, Windows and MacOS. It is written in python and released under GNU General Public License v2.0. Using Diffuse you can compare and merge text files side by side manually. It also supports Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories to retrieve files. You can edit files directly and comes with Syntax highlighting, Line matching, Unicode support and more.
