Diffuse

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 CVS, git, mercurial, and subversion repositories for comparison and merging.

Screenshots

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
• CVS, git, mercurial, and subversion support
• support for UTF-8 encoded unicode
• unlimited undo
• easy keyboard navigation

Documentation

• User's Manual

Requirements

Although Diffuse has been designed for POSIX platforms, it has been successfully run on Microsoft Windows with minor modification.

• Python >= 2.4
• PyGTK >= 2.10

Copyright and Licence

Copyright © 2006-2008 Derrick Moser

Diffuse is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the licence, or (at your option) any later version.

Download

Download from:

• sourceforge.net

Release History

0.2.12

Released 2008-05-06

• alternate codecs for reading and writing files
• more search options
• editor support for primary selection
• minor bug fixes

0.2.11

Released 2008-04-27

• python re-write
• syntax highlighting
• search and replace
• customisable through configuration files
• tabbed viewer panes

0.1.14

Released 2006-01-28

• initial public release