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 Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK 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
• Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK support
• support for UTF-8 encoded unicode
• unlimited undo
• easy keyboard navigation

Documentation

• User's Manual

Requirements

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

• Python >= 2.4
• PyGTK >= 2.10

Pre-built packages for Microsoft Windows include all dependencies.

Copyright and Licence

Copyright © 2006-2009 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.3.4

Released 2009-07-03

• syntax highlighting for .plist, GLSL, SConscript, and SConstruct files
• status bar now explains how to navigate between modes
• added labels to indicate syntax highlighting rules, encoding, and format
• Subversion 1.6 support
• added Henri Menke's German translation
• added '--examplesdir=' and '--mandir=' options to install.py
• renamed the '--python-interpreter=' installer option to '--pythonbin='
• minor bug fixes

0.3.3

Released 2009-04-13

• fixed a bug handling the backspace key with the cursor in the first column

0.3.2

Released 2009-04-13

• POSIX installer with '--destdir=' and '--files-only' options for packagers
• vi-like keybindings for line mode
• '-m' option to open modified files in separate tabs
• 'Merge From Left Then Right' and 'Merge From Right Then Left' menu items
• drag-n-drop support
• preferences for behaviour of tabs
• files with edits now tagged with '*'
• auto indent
• 'Open File In New Tab...' and 'Open Modified Files...' menu items
• 'Save All' menu item
• mac-style line ending support
• new end of line display behaviour
• improved organisation of menu items
• button bar no longer grabs keyboard focus
• removed dependence on urllib module
• errors are now reported on stderr
• removed TODO list
• minor bug fixes

0.3.1

Released 2009-03-05

• fixed a bug affecting the 'Find...' dialogue

0.3.0

Released 2009-03-03

The rules for parsing files in ~/.diffuse have changed in the 0.3.0 release. Non-fatal errors may be reported when parsing old files. These errors can be fixed by removing the offending lines (or the entire file) from ~/.diffuse/diffuserc. Errors in ~/.diffuse/config will be automatically fixed when Diffuse exits.

• new Windows installer
• notification on focus change when files change on disk
• menu items for adjusting indentation
• syntax highlighting for Objective-C++
• '-c' option now works with CVS-style revision numbers
• window title now describes current tab
• search settings now persist across sessions
• minor bug fixes

0.2.15

Released 2008-12-03

• smoother scrolling
• panes and tabs can now be manually re-organised
• preferences for tab key behaviour
• 'go to line' menu item
• '-c' option for viewing the changes of a particular commit
• home/end keys can now be used in line mode
• confirmation requested before overriding changed files
• position of window now saved
• syntax files for more file types
• reading /etc/diffuserc now optional when using a personal configuration file
• minor bug fixes

0.2.14

Released 2008-10-20

• Microsoft Windows port
• svk support
• syntax files for more file types
• DOS / Unix line endings now respected in edit operations
• improved difference map
• more robust launching of help browsers
• man page
• command line display options
• moved some resources to the preferences dialogue
• file revisions can now be specified in the open file dialogue
• minor bug fixes

0.2.13

Released 2008-05-16

• bazaar, darcs, and monotone support
• configurable key bindings
• persistent preference settings
• optimisations
• minor bug fixes

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