1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
|
<?xml version="1.0" ?>
<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
<!ENTITY % English "INCLUDE">
]>
<refentry lang="&language;">
<refentryinfo>
<title>KDiff3 User's Manual</title>
<author><firstname>Burkhard</firstname><surname>Lueck</surname>
<contrib>KDiff3 man page.</contrib>
&Burkhard.Lueck.mail;
</author>
<date>2019-02-22</date>
<releaseinfo>kdiff3 1.8</releaseinfo>
</refentryinfo>
<refmeta>
<refentrytitle><command>kdiff3</command></refentrytitle>
<manvolnum>1</manvolnum>
</refmeta>
<refnamediv>
<refname><command>kdiff3</command></refname>
<refpurpose>Tool for Comparison and Merge of Files and Folders</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>kdiff3</command>
<arg choice="opt"><option>-u, --ignore</option></arg>
<arg choice="opt"><option>--query</option></arg>
<arg choice="opt"><option>--html</option></arg>
<arg choice="opt"><option>--abort</option></arg>
<arg choice="opt"><option>-m, --merge</option></arg>
<arg choice="opt"><option>-b, --base</option> <replaceable>file</replaceable></arg>
<arg choice="opt"><option>-o, --output</option> <replaceable>file</replaceable></arg>
<arg choice="opt"><option>--out</option> <replaceable>file</replaceable></arg>
<arg choice="opt"><option>--noauto</option></arg>
<arg choice="opt"><option>--auto</option></arg>
<arg choice="opt"><option>--L1</option> <replaceable>alias1</replaceable></arg>
<arg choice="opt"><option>--L2</option> <replaceable>alias2</replaceable></arg>
<arg choice="opt"><option>--L3</option> <replaceable>alias3</replaceable></arg>
<arg choice="opt"><option>-L, --fname</option> <replaceable>alias</replaceable></arg>
<arg choice="opt"><option>--cs</option> <replaceable>string</replaceable></arg>
<arg choice="opt"><option>--confighelp</option></arg>
<arg choice="opt"><option>--config</option> <replaceable>file</replaceable></arg>
<arg choice="opt"><option><replaceable>File1</replaceable></option></arg>
<arg choice="opt"><option><replaceable>File2</replaceable></option></arg>
<arg choice="opt"><option><replaceable>File3</replaceable></option></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>Description</title>
<para>Compares two or three input files or folders.</para>
</refsect1>
<refsect1>
<title>Options</title>
<variablelist>
<varlistentry>
<term><option>-u, --ignore</option></term>
<listitem><para>Ignored. (User defined.)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--query</option></term>
<listitem><para>Ignored. (User defined.)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--html</option></term>
<listitem><para>Ignored. (User defined.)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--abort</option></term>
<listitem><para>Ignored. (User defined.)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-m, --merge</option></term>
<listitem><para>Merge the input.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-b, --base</option> <replaceable>file</replaceable></term>
<listitem><para>Explicit base file. For compatibility with certain tools.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-o, --output</option> <replaceable>file</replaceable></term>
<listitem><para>Output file. Implies -m. ⪚: -o newfile.txt
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--out</option> <replaceable>file</replaceable></term>
<listitem><para>Output file, again. (For compatibility with certain tools.)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--auto</option></term>
<listitem><para>No GUI if all conflicts are auto-solvable.
(Needs <option>-o</option> <replaceable>file</replaceable>)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--noauto</option></term>
<listitem><para>Ignore --auto and always show GUI.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--L1</option> <replaceable>alias1</replaceable></term>
<listitem><para>Visible name replacement for input file 1 (base).
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--L2</option> <replaceable>alias2</replaceable></term>
<listitem><para>Visible name replacement for input file 2.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--L3</option> <replaceable>alias3</replaceable></term>
<listitem><para>Visible name replacement for input file 3.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>-L, --fname</option> <replaceable>alias</replaceable></term>
<listitem><para>Alternative visible name replacement. Supply this once for every input.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--cs</option> <replaceable>string</replaceable></term>
<listitem><para>Override a config setting. Use once for every setting.
⪚: <option>--cs</option> <replaceable>AutoAdvance=1</replaceable>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--confighelp</option></term>
<listitem><para>Show list of config settings and current values.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--config</option> <replaceable>file</replaceable></term>
<listitem><para>Use a different config file.
</para></listitem>
</varlistentry>
<varlistentry>
<term><option><replaceable>File1</replaceable></option></term>
<listitem><para>file1 to open (base, if not specified via --<option>base</option>)
</para></listitem>
</varlistentry>
<varlistentry>
<term><option><replaceable>File2</replaceable></option></term>
<listitem><para>file2 to open
</para></listitem>
</varlistentry>
<varlistentry>
<term><option><replaceable>File3</replaceable></option></term>
<listitem><para>file3 to open
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>See Also</title>
<simplelist>
<member>More detailed user documentation is available from <ulink
url="help:/kdiff3">help:/kdiff3</ulink>
(either enter this &URL; into &konqueror;, or run
<userinput><command>khelpcenter</command>
<parameter>help:/kdiff3</parameter></userinput>).</member>
<member>kf6options(7)</member>
<member>qt6options(7)</member>
</simplelist>
</refsect1>
<refsect1>
<title>Authors</title>
<para>This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;.</para>
</refsect1>
</refentry>
|
