Diffuse
Diffuse is a graphical tool for comparing and merging text files. It can work with many revision control systems as a diff viewer or merge tool. Diffuse is able to compare an arbitrary number of files side-by-side (n-way merge), and gives the user the ability to manually correct line matching and directly edit the files.
| Tags | Software Development Version Control |
|---|---|
| Licenses | GPLv2 |
| Implementation | PyGTK Python |
Recent releases
- 04 Jul 2009 01:45
Changes: Diffuse now has German localization and supports Subversion 1.6. Labels were added to indicate the current syntax highlighting rules being used as well as the encoding and format of each file. Syntax highlighting was expanded to include GLSL and recognize Scons and .plist files. Several minor bugs were also fixed.
- 14 Apr 2009 00:52
Changes: This release fixes a bug handling the backspace key when the cursor is in the first column.
- 13 Apr 2009 17:41
Changes: This release can identify modified files under revision control, and has new options for resolving 3-way merges by choosing both left and right inputs and ordering the hunks. Mac OS style line endings are now supported, and new display options have been added to customize the display of line endings. Files that have been edited are now tagged with a '*' in their headers, and a "Save All" menu item was added. Vi-like key bindings have been added to line mode. Drag and drop support of files has been added, and the editor has a new auto-indent feature. Many minor bugs were fixed.
- 06 Mar 2009 01:20
Changes: This release fixes a bug that broke the "Find...", "Find Previous", and "Find Next" menu items.
- 03 Mar 2009 15:07
Changes: New menu items were added to adjust indentation. Diffuse now checks for changes to files on disk and will notify users on keyboard focus change. The "-c" option has been updated to support CVS-style revision numbers. Syntax highlighting rules for Objective-C++ have been added. Several minor bugs were also fixed. A new installer is used for Windows builds.
