joachim99@66: KDiff3-Readme for Windows joachim99@66: ========================= joachim99@66: joachim99@66: Author: Joachim Eibl (joachim.eibl@gmx.de) joachim99@69: Copyright: (C) 2002-2006 by Joachim Eibl joachim99@69: KDiff3-Version: 0.9.89 joachim99@66: Homepage: http://kdiff3.sourceforge.net joachim99@66: joachim99@66: KDiff3 is a program that joachim99@66: - compares and merges two or three input files or directories, joachim99@66: - shows the differences line by line and character by character (!), joachim99@66: - provides an automatic merge-facility and joachim99@66: - an integrated editor for comfortable solving of merge-conflicts joachim99@66: - and has an intuitive graphical user interface. joachim99@66: joachim99@66: Now KDiff3-strings are translated into some languages by the KDE-I18N-team. joachim99@66: (*.qm-files in the KDiff3-directory) joachim99@66: joachim99@66: See the Changelog.txt for a list of fixed bugs and new features. joachim99@66: joachim99@66: Windows-specific information for the precompiled KDiff3 version: joachim99@66: ================================================================ joachim99@66: joachim99@66: This executable is provided for the convenience of users who don't have a joachim99@66: VC6-compiler at hand. joachim99@66: joachim99@66: You may redistribute it under the terms of the GNU GENERAL PUBLIC LICENCE. joachim99@66: joachim99@66: Note that there is NO WARRANTY for this program. joachim99@66: joachim99@66: Installation: joachim99@66: - The installer was created by Sebastien Fricker (sebastien.fricker@web.de). joachim99@66: It is based on the Nullsoft Scriptable Install System (http://nsis.sourceforge.net) joachim99@66: joachim99@66: - You can place the directory where you want it. But don't separate the file joachim99@66: kdiff3.exe from the others, since they are needed for correct execution. joachim99@66: joachim99@66: - Integration with WinCVS: When selected the installer sets KDiff3 to be the joachim99@66: default diff-tool for WinCVS if available. joachim99@66: joachim99@66: - Integration with Explorer: When selected KDiff3 will be added to the "Send To" joachim99@66: menu in the context menu. If you then select two files or two directories and joachim99@66: choose "Send To"->"KDiff3" then KDiff3 will start and compare the specified files. joachim99@66: joachim99@66: Since this program was actually developed for GNU/Linux, there might be Windows joachim99@66: specific problems I don't know of yet. Please write me about problems you encounter. joachim99@66: joachim99@66: Known bugs: joachim99@66: - Links are not handled correctly. (This is because links in Windows are not joachim99@66: the same as under Un*x-filesystems.) joachim99@66: joachim99@66: Licence: joachim99@66: GNU GENERAL PUBLIC LICENSE, Version 2, June 1991 joachim99@66: This program is free software; you can redistribute it and/or modify joachim99@66: it under the terms of the GNU General Public License as published by joachim99@66: the Free Software Foundation; either version 2 of the License, or joachim99@66: (at your option) any later version. joachim99@66: joachim99@66: This program is distributed in the hope that it will be useful, joachim99@66: but WITHOUT ANY WARRANTY; without even the implied warranty of joachim99@66: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the joachim99@66: GNU General Public License for more details. joachim99@66: joachim99@66: You should have received a copy of the GNU General Public License joachim99@66: along with this program; if not, write to the Free Software joachim99@66: Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA joachim99@66: joachim99@66: For details see file "COPYING". joachim99@66: joachim99@66: Exception from the GPL: joachim99@66: As a special exception, the copyright holder Joachim Eibl gives permission joachim99@66: to link this program with the Qt-library (commercial or non-commercial edition) joachim99@66: from Trolltech (www.trolltech.com), and he permits to distribute the resulting joachim99@66: executable, without including the source code for the Qt-library in the joachim99@66: source distribution. joachim99@66: joachim99@66: joachim99@66: joachim99@66: Start from commandline: joachim99@66: - Comparing 2 files: kdiff3 file1 file2 joachim99@66: - Merging 2 files: kdiff3 file1 file2 -o outputfile joachim99@66: - Comparing 3 files: kdiff3 file1 file2 file3 joachim99@66: - Merging 3 files: kdiff3 file1 file2 file3 -o outputfile joachim99@66: Note that file1 will be treated as base of file2 and file3. joachim99@66: joachim99@66: If all files have the same name but are in different directories, you can joachim99@66: reduce typework by specifying the filename only for the first file. E.g.: joachim99@66: - Comparing 3 files: kdiff3 dir1/filename dir2 dir3 joachim99@66: (This also works in the open-dialog.) joachim99@66: joachim99@66: - Comparing 2 directories: kdiff3 dir1 dir2 joachim99@66: - Merging 2 directories: kdiff3 dir1 dir2-o destinationdir joachim99@66: - Comparing 3 directories: kdiff3 dir1 dir2 dir3 joachim99@66: - Merging 3 directories: kdiff3 dir1 dir2 dir3 -o destinationdir joachim99@66: (Please read the documentation about comparing/merging directories, joachim99@66: especially before you start merging.) joachim99@66: joachim99@66: If you start without arguments, then a dialog will appear where you can joachim99@66: select your files and directories via a filebrowser. joachim99@66: joachim99@66: For more documentation, see the help-menu or the subdirectory doc. joachim99@66: joachim99@66: Have fun!