1KDIFF3(1) KDiff3 User's Manual KDIFF3(1)
2
3
4
6 kdiff3 - Tool for Comparison and Merge of Files and Directories
7
9 kdiff3 [-u, --ignore] [--query] [--html] [--abort] [-m, --merge]
10 [-b, --base file] [-o, --output file] [--out file] [--auto]
11 [--qall] [-L1 alias1] [-L2 alias2] [-L3 alias3]
12 [-L, --fname alias] [--cs string] [--confighelp] [--config file]
13 [File1] [File2] [File3]
14
16 Compares two or three input files or directories.
17
19 -u, --ignore
20 Ignored. (User defined.)
21
22 --query
23 Ignored. (User defined.)
24
25 --html
26 Ignored. (User defined.)
27
28 --abort
29 Ignored. (User defined.)
30
31 -m, --merge
32 Merge the input.
33
34 -b, --base file
35 Explicit base file. For compatibility with certain tools.
36
37 -o, --output file
38 Output file. Implies -m. e.g.: -o newfile.txt
39
40 --out file
41 Output file, again. (For compatibility with certain tools.)
42
43 --auto
44 No GUI if all conflicts are auto-solvable. (Needs -o file)
45
46 --qall
47 Don't solve conflicts automatically.
48
49 -L1 alias1
50 Visible name replacement for input file 1 (base).
51
52 -L2 alias2
53 Visible name replacement for input file 2.
54
55 -L3 alias3
56 Visible name replacement for input file 3.
57
58 -L, --fname alias
59 Alternative visible name replacement. Supply this once for every
60 input.
61
62 --cs string
63 Override a config setting. Use once for every setting. e.g.: --cs
64 AutoAdvance=1.
65
66 --confighelp
67 Show list of config settings and current values.
68
69 --config file
70 Use a different config file.
71
72 File1
73 file1 to open (base, if not specified via --base)
74
75 File2
76 file2 to open
77
78 File3
79 file2 to open
80
82 More detailed user documentation is available from help:/kdiff3
83 (either enter this URL into Konqueror, or run khelpcenter
84 help:/kdiff3).
85 kf5options(7)
86 qt5options(7)
87
89 This manual page was written by Burkhard Lück <lueck@hube-lueck.de>.
90
92 Burkhard Lueck <lueck@hube-lueck.de>
93 KDiff3 man page.
94
95
96
97kdiff3 1.8 2019-02-22 KDIFF3(1)