Diffuse v0.4.8

Diffuse is a graphical tool for merging and comparing text files, intended to help you easily merge, edit, and review changes to your code.

Key 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
• easy keyboard navigation