Diffuse 0.4.8 Description:
Diffuse is a simple, neat, free and cross-platform graphical desktop utility that can be used for comparing and merging text files. The application also integrates a diff viewer that is compatible with several popular revision control systems. Diffuse lets users to easily and quickly compare various text files side-by-side, as well as to edit these files while they are compared. It features line-matching, highlighting of character differences, and supports UTF-8 encoded Unicode. Line matching can be manually corrected by the user, and the following revision control systems are supported at the moment: Git, Subversion (SVN), Mercurial, Bazaar, Darcs, CVS, Monotone, SVK and RCS. Support for keyboard shortcuts is also implemented.