diff options
| author | Michiel van Wessem <michiel@slackbuilds.org> | 2010-05-11 20:00:26 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-11 20:00:26 +0200 |
| commit | 582038ec65f4aafcf4847ef8fe5a8c1b1198941b (patch) | |
| tree | 03f7800981adf29f315c53e3629c1a51ac01e0c4 /development/kdiff3/README | |
| parent | 8dad5197cd99e8b4b11782fd2e0b1e75d9ad73af (diff) | |
development/kdiff3: Added to 12.0 repository
Diffstat (limited to 'development/kdiff3/README')
| -rw-r--r-- | development/kdiff3/README | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/development/kdiff3/README b/development/kdiff3/README new file mode 100644 index 000000000000..f945d8dce90d --- /dev/null +++ b/development/kdiff3/README @@ -0,0 +1,15 @@ +KDiff3 is a program that + * compares or merges two or three text input files or directories, + * shows the differences line by line and character by character (!), + * provides an automatic merge-facility and + * an integrated editor for comfortable solving of merge-conflicts, + * supports Unicode, UTF-8 and other codecs, autodetection via + byte-order-mark "BOM" + * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), + * Printing of differences, + * Manual alignment of lines, + * Automatic merging of version control history ($Log$), + * and has an intuitive graphical user interface. + * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell extension + included in installer (originally by Sergey Zorin: see also Diff Ext) + * Read what else is special in a short abstract (PDF). |