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