1KDIFF3(1) General Commands Manual KDIFF3(1)
2
3
4
6 kdiff3 — compares two or three input files or directories
7
9 kdiff3 [QT options] [KDE options] [kdiff3 options] [File1] [File2]
10 [File3]
11
13 This manual page documents briefly the kdiff3 tool.
14
15 This manual page was written for the Debian distribution because the
16 original program does not have a manual page. For comprehensive help,
17 please see khelpcenter help:/kdiff3.
18
19
20 kdiff3 is a program that
21
22
23 · compares two or three input files
24
25 · shows the differences line by line and character by character
26
27 · provides an automatic merge-facility and
28
29 · an integrated editor for comfortable solving of merge-conflicts
30
31 · and has an intuitive graphical user interface
32
33 · and allows directory comparison and merge.
34
36 This program follows the usual GNU command line syntax, with long
37 options starting with two dashes (`-'). A summary of options is
38 included below. For a full summary of options, run kdiff3 --help.
39
40
41
42 -m, --merge
43 Merge the input.
44
45 -b, --base file
46 Explicit base file. For compatibility with certain tools.
47
48 -o, --output file
49 Output file. Implies -m. E.g.: -o newfile.txt
50
51 --out file
52 Output file, again. (For compatibility with certain tools.)
53
54 --auto No GUI if all conflicts are auto-solvable. (Needs -o file)
55
56 --qall Don't solve conflicts automatically. (For compatibility...)
57
58 --fname alias
59 Visible name replacement. Supply this once for every input.
60
61 -v, --version
62 Show version of program.
63
65 This manual page was written by Eike Sauer <eikes@cs.tu-berlin.de> for
66 the Debian system (but may be used by others). Permission is granted
67 to copy, distribute and/or modify this document under the terms of the
68 GNU General Public License, Version 2 (or, at your option, any later
69 version published by the Free Software Foundation).
70
71
72 On Debian systems, the complete text of the GNU General Public License
73 can be found in /usr/share/common-licenses/GPL.
74
75
76
77
78 KDIFF3(1)