Download Diffuse, to compare or merge text filesExcellence Award
Diffuse is a free utility for merging and comparing text files. It is able to compare an arbitrary number of files side-by-side, letting you also manually adjust line-matching and directly edit the files.
Diffuse can retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK repositories for comparison and merging.
Features: ability to compare and merge an arbitrary number of files side-by-side (n-way merges) * line matching can be manually corrected by the user * ability to directly edit files * syntax highlighting * Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support * support for UTF-8 encoded unicode * unlimited undo