Attention!
- personal configuration files are now stored in ~/.config/diffuse/
(the README file describes how to migrate old settings)
Diffuse 0.4.1 - 2009-10-12
- added Japanese translation
- added Liu Hao's simplified Chinese translation
- added a 'Dismiss All Edits' menu item
- personal configuration files are now stored in ~/.config/diffuse/
(the README file describes how to migrate old settings)
- localised manuals are now supported on Windows
- new command line option for specifying blank file comparison panes
- new preference to enable/disable line numbers
- Diffuse now quits if no viewers were created with the -m option
- MMB on a notebook tab now closes the tab
- RMB on a notebook tab creates a popup menu to set the current page
- added "Undo Close Tab" menu item
- replaced "Closing last tab quits Diffuse" preference with a "Warn
me when closing a tab will quit Diffuse" preference
- added new menu items and buttons for copying lines between panes
- changed the default hotkeys for merging to reflect the direction text "moves"
Diffuse 0.4.0 - 2009-08-17
- changed the default hotkeys for merging to reflect the direction text "moves"
- added format menu with new items for changing case, sorting, and manipulating white space
- replaced 'Hide end of line characters' preference with 'Show white space characters'
- errors are now reported in a dialogue instead of printing to stderr
- optimised redraws when only the cursor position has changed
- input methods that use pre-editing can now be used when editing text
- dead keys can now be used when editing text
- updated Monotone support to use 'mtn automate inventory'
- Git support now handles files flagged as 'unmerged'
- graceful handling of and non-zero exit codes from 'git status'
- added version control section to the manual
- minor bug fixes
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
Add an additional post-release fix from upstream (patch-aa).
Shared directories can now be created independently by the pacakges
needing them and will be removed automatically by pkg_delete when empty.
Packages needing empty directories can use the @pkgdir command in PLIST.
Discussed and ok'd in thread starting at
http://mail-index.netbsd.org/tech-pkg/2009/06/30/msg003546.html
a bug fix.
Set LICENSE.
Diffuse 0.3.3 - 2009-04-13
- fixed a bug handling the backspace key with the cursor in the first column
Diffuse 0.3.2 - 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
Next release will not use urllib.
Diffuse 0.3.1 - 2009-03-05
- fixed a typo that broke the 'Find...' dialogue
Diffuse 0.3.0 - 2009-03-03
- 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
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.
Some key features of Diffuse:
- 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
