Diffuse

Compare several text files side by side, inspect their differences, and merge selected changes into a combined result with Diffuse. Its workspace keeps the files visible together, making it easier to reconcile edits or examine several versions of the same text without switching between separate windows. It is suited to developers, technical writers, and anyone reviewing revisions or resolving conflicting changes in text-based files.

Diffuse can compare and merge an arbitrary number of files instead of restricting the task to a single pair. If automatic line alignment connects the wrong passages, you can manually adjust the matching so that the comparison reflects the intended relationships. Files remain editable during the review, so corrections and merge decisions can be made directly in the same session. Syntax highlighting, UTF-8 Unicode text support, unlimited undo, and keyboard navigation provide additional control during detailed text work.

For version-control workflows, Diffuse can obtain file revisions for comparison and merging from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK. Derrick Moser publishes it as freeware system-tools software for Windows, and the current version is 0.4.8.1.