A graphical N-way diff and merge tool written in python Maintained by:marco.broeder@gmx.eu Port Added: 11 Apr 2009 23:28:15 Also Listed In:python
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
WWW: http://diffuse.sourceforge.net/
To install the port:cd /usr/ports/devel/diffuse/ && make install clean To add the package:pkg_add -r diffuse
Configuration Options
===> The following configuration options are available for diffuse-0.4.1_2:
MENU=on (default) "Add desktop menu (needs desktop-file-utils)"
OMF=on (default) "Install OMF manual (needs scrollkeeper)"
NLS=on (default) "Install some translations (work in progress)"
===> Use 'make config' to modify these settings
- Correct wrong path in omf file
- 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)
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
WWW: http://diffuse.sourceforge.net/
PR: ports/132027
Submitted by: Marco Broeder <marco.broeder at gmx.eu>