diff options
Diffstat (limited to 'development/kdiff3/README')
| -rw-r--r-- | development/kdiff3/README | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/development/kdiff3/README b/development/kdiff3/README index fec26dc27f3b0..758e1599600a9 100644 --- a/development/kdiff3/README +++ b/development/kdiff3/README @@ -1,22 +1,17 @@ -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 text input files or folders, + * shows the differences line by line and character by character(!), + * provides an automatic merge-facility, + * has an editor for comfortable solving of merge-conflicts, + * provides network transparency via KIO, + * option for highlight or hide changes in white-space or comments, + * supports Unicode, UTF-8 and other file encodings, + * prints differences, + * supports version control keyword and history merging. -NOTE: By default, a KDE version is compiled. If you prefer a Qt4-only -version, pass the script QT4ONLY=yes, like: +KDiff3 is a KDE Application +KDiff3 requires KDE Frameworks packages provided by Slackware + +NOTE: The historical Qt4-only build has not been ported to Qt5. -QT4ONLY=yes ./kdiff3.SlackBuild |