Warning, /sdk/kdiff3/README is written in an unsupported language. File is not indexed.

0001 KDiff3-Readme
0002 =============
0003 
0004 Author: Joachim Eibl  (joachim.eibl at gmx.de)
0005 Port to KF5/Qt5 by Michael Reeves (reeves.87@gmail.com)
0006 KDiff3-Version: 1.10.70
0007 
0008 Now requires Qt 5.12 or later and KF5 5.70+. Legacy 0.9.98 and earlier builds are not supported.
0009 MacOS X build is 64-bit only unfortunately I can't test build locally. The Konqueror specific plug-in
0010 is not ported and no longer maintained. This plug-in would only apply to KDE before 4.6. As of 1/13/17
0011 cmake 3.1+ is the targeted cmake version.
0012 
0013 cmake is now the only build system supported. KF5/Qt5 was big jump. A lot changed besides just the API.
0014 I am not against a Qt5-only build variant but see no reason to maintain two separate build systems.
0015 At present KF5 is my focus.
0016 
0017 Known Issues:
0018 *Binary comparison has been temporarily disabled due to stability issues.
0019 *Network comparison operation via non file urls may fail for some configurations. This is under investigation.
0020 
0021 The current repository is at https://invent.kde.org/sdk/kdiff3
0022 
0023 Binaries can be downloaded at https://download.kde.org/stable/kdiff3/?C=M;O=D
0024 
0025 Bugs can be reported at https://bugs.kde.org
0026 
0027 The original pre KF5/Qt5 Readme follows old build instructions have been removed to avoid confusion:
0028 
0029 
0030 Copyright: (C) 2002-2014 by Joachim Eibl
0031 
0032 KDiff3 runs best on KDE but can be built without it, depending only on Qt-libs.
0033 These are available for Un*x, Windows, Mac.
0034 Thus there are many setup possibilities to consider.
0035 
0036 Supported Qt-versions: 4.8, 5.2 or higher.
0037 Supported KDE-version: 4, 5
0038 (For KDE3/Qt3 use KDiff3-0.9.92 or older.)
0039 
0040 Contents
0041 --------
0042 
0043 - Introduction
0044 - License
0045 - Additional hints
0046 
0047 
0048 Introduction
0049 ------------
0050 
0051 KDiff3 is a program that
0052 - compares and merges two or three input files or directories,
0053 - shows the differences line by line and character by character (!),
0054 - provides an automatic merge-facility and
0055 - an integrated editor for comfortable solving of merge-conflicts
0056 - has support for KDE-KIO (ftp, sftp, http, fish, smb),
0057 - has an intuitive graphical user interface,
0058 - provides a context menu for KDE-Dolphin and Windows-Explorer,
0059 - supports 64 bit systems. (Some build issues are discussed in here.)
0060 - Support for many encodings and Unicode.
0061 
0062 Do you want help translating? Read the instructions on https://l10n.kde.org/ !
0063 
0064 
0065 License
0066 -------
0067 
0068     GNU GENERAL PUBLIC LICENSE, Version 2, June 1991
0069     This program is free software; you can redistribute it and/or modify
0070     it under the terms of the GNU General Public License as published by
0071     the Free Software Foundation; either version 2 of the License, or
0072     (at your option) any later version.
0073 
0074     This program is distributed in the hope that it will be useful,
0075     but WITHOUT ANY WARRANTY; without even the implied warranty of
0076     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
0077     GNU General Public License for more details.
0078 
0079     You should have received a copy of the GNU General Public License
0080     along with this program; if not, write to the Free Software
0081     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307
0082     USA
0083 
0084     For details see file "COPYING".
0085 
0086 
0087 ------------------------------------------------------------------------
0088 
0089 Additional hints
0090 ----------------
0091 
0092    Start from commandline:
0093    - Comparing 2 files:     kdiff3 file1 file2
0094    - Merging 2 files:       kdiff3 file1 file2 -o outputfile
0095    - Comparing 3 files:     kdiff3 file1 file2 file3
0096    - Merging 3 files:       kdiff3 file1 file2 file3 -o outputfile
0097         Note that file1 will be treated as base of file2 and file3.
0098 
0099    If all files have the same name but are in different directories, you can
0100    reduce typework by specifying the filename only for the first file. E.g.:
0101    - Comparing 3 files:     kdiff3 dir1/filename dir2 dir3
0102    (This also works in the open-dialog.)
0103 
0104    If you start without arguments, then a dialog will appear where you can
0105    select your files via a filebrowser.
0106 
0107    For more documentation, see the help-menu or the subdirectory doc.
0108 
0109    Have fun!