diff options
Diffstat (limited to 'development/kdiff3/README')
| -rw-r--r-- | development/kdiff3/README | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/development/kdiff3/README b/development/kdiff3/README index 5cfbd27567..8f2dae59fc 100644 --- a/development/kdiff3/README +++ b/development/kdiff3/README @@ -1,21 +1,13 @@ -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). +KDiff3 is a file and folder diff and merge tool which + * compares and merges two or three 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 + * has support for KDE-KIO (ftp, sftp, http, fish, smb), + * has an intuitive graphical user interface, + * provides a context menu for KDE-Dolphin and Windows-Explorer, + * Support for many encodings and Unicode. -NOTE: By default, a KDE version is compiled. If you prefer a Qt4-only -version, pass the script QT4ONLY=yes, like: - -QT4ONLY=yes ./kdiff3.SlackBuild +KDiff3 is a KDE Application +KDiff3 requires KDE Frameworks packages provided by Slackware |