Changes:
- Git support now recognises conflicts when re-applying the stash
- double clicking on text can now select full words with non-English
characters
- search dialog is now automatically populated with the currently
selected text
- fixed a bug that prevented opening files with non-ASCII characters
in their path
- added Oleg Pakhtusov's Russian translation
- added Kang Bundo's Korean translation
- pane headers tooltips
- Shift-ScrollWheel can now be used to scroll horizontally
PR: ports/151631
Submitted by: Marco Broder <marco.broeder@gmx.eu> (maintainer)
Approved by: pgollucci (mentor, implicit)
- While here, fix plist (share/pixmaps is in the mtree, should not be removed)
PR: 138308
Submitted by: Marco Bröder <marco.broeder@gmx.eu> (maintainer)
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
WWW: http://diffuse.sourceforge.net/
PR: ports/132027
Submitted by: Marco Broeder <marco.broeder at gmx.eu>
