Diffuse – small and simple text merge tool written in Python

Diffuse is an open source graphical tool for merging and comparing text files.

Diffuse is able to compare an arbitrary number of files side-by-side and offers 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, Subversion and GNU Revision Control System (RCS) repositories for comparison and merging.

Features include:

  • Compare and merge an arbitrary number of files side-by-side (n-way merges).
  • Line matching can be manually corrected by the user.
  • Directly edit files.
  • Syntax highlighting.
  • Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion, and SVK support.
  • Unicode support.
  • Unlimited undo.
  • Easy keyboard navigation.

Website: diffuse.sourceforge.net
Developer: Derrick Moser
License: GNU GPL v2

Return to Diff Tools Home Page

Are you interested in learning the art of programming? There are lots of excellent free and open source programming books that teach you how to program in every popular programming language. Read these Free Books.