diff options
Diffstat (limited to 'development/diffuse/README')
| -rw-r--r-- | development/diffuse/README | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/development/diffuse/README b/development/diffuse/README new file mode 100644 index 0000000000..1d3c9e8dba --- /dev/null +++ b/development/diffuse/README @@ -0,0 +1,19 @@ +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 + + + |