slackbuilds

History

dsomero d0c108251a various: Update find command to match template. Signed-off-by: dsomero <xgizzmo@slackbuilds.org>		2013-11-22 02:37:19 -05:00
..
README	development/diffuse: Added (tool for merging and comparing files)	2012-06-03 15:21:11 -05:00
diffuse.SlackBuild	various: Update find command to match template.	2013-11-22 02:37:19 -05:00
diffuse.info	development/diffuse: Updated for version 0.4.7.	2013-07-18 15:10:29 -05:00
doinst.sh	development/diffuse: Added (tool for merging and comparing files)	2012-06-03 15:21:11 -05:00
slack-desc	various: Fix slack-desc formatting and comment nit picks.	2013-11-22 02:29:22 -05:00

README

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, RCS, 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
- line matching can be manually corrected by the user
- ability to directly edit files
- syntax highlighting
- Bazaar, CVS, Darcs, Git, Mercurial, Monotone, RCS, Subversion,
  and SVK support
- Unicode support
- unlimited undo
- easy keyboard navigation