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