diff options
Diffstat (limited to 'development/kdiff3/README')
| -rw-r--r-- | development/kdiff3/README | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/development/kdiff3/README b/development/kdiff3/README index 758e159960..8f2dae59fc 100644 --- a/development/kdiff3/README +++ b/development/kdiff3/README @@ -1,17 +1,13 @@ 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. + * 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. 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. - |