Mercurial > hg > easyhg-kdiff3

annotate kdiff3/README_WIN.txt @ 60:4732f709a8cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author joachim99
date Sun, 07 Mar 2004 10:08:07 +0000
parents c59d5a3a8ff3
children
rev   line source
joachim99@33 1 KDiff3-Readme for Windows
joachim99@33 2 =========================
joachim99@33 3
joachim99@33 4 Author: Joachim Eibl (joachim.eibl@gmx.de)
joachim99@33 5 Copyright: (C) 2002-2003 by Joachim Eibl
joachim99@51 6 KDiff3-Version: 0.9.80
joachim99@33 7 Homepage: http://kdiff3.sourceforge.net
joachim99@33 8
joachim99@33 9 KDiff3 is a program that
joachim99@33 10 - compares and merges two or three input files or directories,
joachim99@33 11 - shows the differences line by line and character by character (!),
joachim99@33 12 - provides an automatic merge-facility and
joachim99@33 13 - an integrated editor for comfortable solving of merge-conflicts
joachim99@33 14 - and has an intuitive graphical user interface.
joachim99@33 15
joachim99@33 16 See the Changelog.txt for a list of fixed bugs and new features.
joachim99@33 17
joachim99@33 18 Windows-specific information for the precompiled KDiff3 version:
joachim99@33 19 ================================================================
joachim99@33 20
joachim99@33 21 This executable is provided for the convenience of users who don't have a
joachim99@33 22 VC6-compiler at hand.
joachim99@33 23
joachim99@33 24 You may redistribute it under the terms of the GNU GENERAL PUBLIC LICENCE.
joachim99@33 25
joachim99@33 26 Note that there is NO WARRANTY for this program.
joachim99@33 27
joachim99@33 28 Installation:
joachim99@33 29 - The installer was created by Sebastien Fricker (sebastien.fricker@web.de).
joachim99@33 30 It is based on the Nullsoft Scriptable Install System (http://nsis.sourceforge.net)
joachim99@33 31
joachim99@33 32 - You can place the directory where you want it. But don't separate the file
joachim99@33 33 kdiff3.exe from the others, since they are needed for correct execution.
joachim99@33 34
joachim99@33 35 - Integration with WinCVS: When selected the installer sets KDiff3 to be the
joachim99@33 36 default diff-tool for WinCVS if available.
joachim99@33 37
joachim99@33 38 - Integration with Explorer: When selected KDiff3 will be added to the "Send To"
joachim99@33 39 menu in the context menu. If you then select two files or two directories and
joachim99@33 40 choose "Send To"->"KDiff3" then KDiff3 will start and compare the specified files.
joachim99@33 41
joachim99@33 42 Since this program was actually developed for GNU/Linux, there might be Windows
joachim99@33 43 specific problems I don't know of yet. Please write me about problems you encounter.
joachim99@33 44
joachim99@33 45 Known bugs:
joachim99@33 46 - Links are not handled correctly. (This is because links in Windows are not
joachim99@33 47 the same as under Un*x-filesystems.)
joachim99@33 48
joachim99@33 49 Licence:
joachim99@33 50 GNU GENERAL PUBLIC LICENSE, Version 2, June 1991
joachim99@33 51 This program is free software; you can redistribute it and/or modify
joachim99@33 52 it under the terms of the GNU General Public License as published by
joachim99@33 53 the Free Software Foundation; either version 2 of the License, or
joachim99@33 54 (at your option) any later version.
joachim99@33 55
joachim99@33 56 This program is distributed in the hope that it will be useful,
joachim99@33 57 but WITHOUT ANY WARRANTY; without even the implied warranty of
joachim99@33 58 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
joachim99@33 59 GNU General Public License for more details.
joachim99@33 60
joachim99@33 61 You should have received a copy of the GNU General Public License
joachim99@33 62 along with this program; if not, write to the Free Software
joachim99@33 63 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
joachim99@33 64
joachim99@33 65 For details see file "COPYING".
joachim99@33 66
joachim99@33 67 Exception from the GPL:
joachim99@33 68 As a special exception, the copyright holder Joachim Eibl gives permission
joachim99@33 69 to link this program with the Qt-library (commercial or non-commercial edition)
joachim99@33 70 from Trolltech (www.trolltech.com), and he permits to distribute the resulting
joachim99@33 71 executable, without including the source code for the Qt-library in the
joachim99@33 72 source distribution.
joachim99@33 73
joachim99@33 74
joachim99@33 75
joachim99@33 76 Start from commandline:
joachim99@33 77 - Comparing 2 files: kdiff3 file1 file2
joachim99@33 78 - Merging 2 files: kdiff3 file1 file2 -o outputfile
joachim99@33 79 - Comparing 3 files: kdiff3 file1 file2 file3
joachim99@33 80 - Merging 3 files: kdiff3 file1 file2 file3 -o outputfile
joachim99@33 81 Note that file1 will be treated as base of file2 and file3.
joachim99@33 82
joachim99@33 83 If all files have the same name but are in different directories, you can
joachim99@33 84 reduce typework by specifying the filename only for the first file. E.g.:
joachim99@33 85 - Comparing 3 files: kdiff3 dir1/filename dir2 dir3
joachim99@33 86 (This also works in the open-dialog.)
joachim99@33 87
joachim99@33 88 - Comparing 2 directories: kdiff3 dir1 dir2
joachim99@33 89 - Merging 2 directories: kdiff3 dir1 dir2-o destinationdir
joachim99@33 90 - Comparing 3 directories: kdiff3 dir1 dir2 dir3
joachim99@33 91 - Merging 3 directories: kdiff3 dir1 dir2 dir3 -o destinationdir
joachim99@33 92 (Please read the documentation about comparing/merging directories,
joachim99@33 93 especially before you start merging.)
joachim99@33 94
joachim99@33 95 If you start without arguments, then a dialog will appear where you can
joachim99@33 96 select your files and directories via a filebrowser.
joachim99@33 97
joachim99@33 98 For more documentation, see the help-menu or the subdirectory doc.
joachim99@33 99
joachim99@33 100 Have fun!