Diffuse

Navigation

About

Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also 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
• Easy keyboard navigation

Requirements

Diffuse should run on any POSIX operating system, including Mac OS X, with the following packages installed:

• Python >= 3.4
• PyGObject >= 3.18

Pre-built packages for Microsoft Windows include all dependencies.