You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 
Andrey Maraev 38caaf0088 development/diffuse: Updated for version 0.4.8. 11 years ago
..
README development/diffuse: Added (tool for merging and comparing files) 14 years ago
diffuse.SlackBuild development/diffuse: Updated for version 0.4.8. 11 years ago
diffuse.info development/diffuse: Updated for version 0.4.8. 11 years ago
doinst.sh development/diffuse: Updated for version 0.4.8. 11 years ago
slack-desc various: Fix slack-desc formatting and comment nit picks. 12 years ago

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