From 582038ec65f4aafcf4847ef8fe5a8c1b1198941b Mon Sep 17 00:00:00 2001 From: Michiel van Wessem Date: Tue, 11 May 2010 20:00:26 +0200 Subject: development/kdiff3: Added to 12.0 repository --- development/kdiff3/README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 development/kdiff3/README (limited to 'development/kdiff3/README') diff --git a/development/kdiff3/README b/development/kdiff3/README new file mode 100644 index 0000000000..f945d8dce9 --- /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). -- cgit v1.2.3