Warning, /sdk/kdiff3/doc/en/man-kdiff3.1.docbook is written in an unsupported language. File is not indexed.
0001 <?xml version="1.0" ?> 0002 <!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ 0003 <!ENTITY % English "INCLUDE"> 0004 ]> 0005 0006 <refentry lang="&language;"> 0007 <refentryinfo> 0008 <title>KDiff3 User's Manual</title> 0009 <author><firstname>Burkhard</firstname><surname>Lueck</surname> 0010 <contrib>KDiff3 man page.</contrib> 0011 &Burkhard.Lueck.mail; 0012 </author> 0013 <date>2019-02-22</date> 0014 <releaseinfo>kdiff3 1.8</releaseinfo> 0015 </refentryinfo> 0016 0017 <refmeta> 0018 <refentrytitle><command>kdiff3</command></refentrytitle> 0019 <manvolnum>1</manvolnum> 0020 </refmeta> 0021 0022 <refnamediv> 0023 <refname><command>kdiff3</command></refname> 0024 <refpurpose>Tool for Comparison and Merge of Files and Folders</refpurpose> 0025 </refnamediv> 0026 0027 <refsynopsisdiv> 0028 <cmdsynopsis> 0029 <command>kdiff3</command> 0030 <arg choice="opt"><option>-u, --ignore</option></arg> 0031 <arg choice="opt"><option>--query</option></arg> 0032 <arg choice="opt"><option>--html</option></arg> 0033 <arg choice="opt"><option>--abort</option></arg> 0034 <arg choice="opt"><option>-m, --merge</option></arg> 0035 <arg choice="opt"><option>-b, --base</option> <replaceable>file</replaceable></arg> 0036 <arg choice="opt"><option>-o, --output</option> <replaceable>file</replaceable></arg> 0037 <arg choice="opt"><option>--out</option> <replaceable>file</replaceable></arg> 0038 <arg choice="opt"><option>--noauto</option></arg> 0039 <arg choice="opt"><option>--auto</option></arg> 0040 <arg choice="opt"><option>--L1</option> <replaceable>alias1</replaceable></arg> 0041 <arg choice="opt"><option>--L2</option> <replaceable>alias2</replaceable></arg> 0042 <arg choice="opt"><option>--L3</option> <replaceable>alias3</replaceable></arg> 0043 <arg choice="opt"><option>-L, --fname</option> <replaceable>alias</replaceable></arg> 0044 <arg choice="opt"><option>--cs</option> <replaceable>string</replaceable></arg> 0045 <arg choice="opt"><option>--confighelp</option></arg> 0046 <arg choice="opt"><option>--config</option> <replaceable>file</replaceable></arg> 0047 <arg choice="opt"><option><replaceable>File1</replaceable></option></arg> 0048 <arg choice="opt"><option><replaceable>File2</replaceable></option></arg> 0049 <arg choice="opt"><option><replaceable>File3</replaceable></option></arg> 0050 </cmdsynopsis> 0051 </refsynopsisdiv> 0052 0053 <refsect1> 0054 <title>Description</title> 0055 <para>Compares two or three input files or folders.</para> 0056 0057 </refsect1> 0058 0059 <refsect1> 0060 <title>Options</title> 0061 <variablelist> 0062 <varlistentry> 0063 <term><option>-u, --ignore</option></term> 0064 <listitem><para>Ignored. (User defined.) 0065 </para></listitem> 0066 </varlistentry> 0067 0068 <varlistentry> 0069 <term><option>--query</option></term> 0070 <listitem><para>Ignored. (User defined.) 0071 </para></listitem> 0072 </varlistentry> 0073 0074 <varlistentry> 0075 <term><option>--html</option></term> 0076 <listitem><para>Ignored. (User defined.) 0077 </para></listitem> 0078 </varlistentry> 0079 0080 <varlistentry> 0081 <term><option>--abort</option></term> 0082 <listitem><para>Ignored. (User defined.) 0083 </para></listitem> 0084 </varlistentry> 0085 0086 <varlistentry> 0087 <term><option>-m, --merge</option></term> 0088 <listitem><para>Merge the input. 0089 </para></listitem> 0090 </varlistentry> 0091 0092 <varlistentry> 0093 <term><option>-b, --base</option> <replaceable>file</replaceable></term> 0094 <listitem><para>Explicit base file. For compatibility with certain tools. 0095 </para></listitem> 0096 </varlistentry> 0097 0098 <varlistentry> 0099 <term><option>-o, --output</option> <replaceable>file</replaceable></term> 0100 <listitem><para>Output file. Implies -m. ⪚: -o newfile.txt 0101 </para></listitem> 0102 </varlistentry> 0103 0104 <varlistentry> 0105 <term><option>--out</option> <replaceable>file</replaceable></term> 0106 <listitem><para>Output file, again. (For compatibility with certain tools.) 0107 </para></listitem> 0108 </varlistentry> 0109 0110 <varlistentry> 0111 <term><option>--auto</option></term> 0112 <listitem><para>No GUI if all conflicts are auto-solvable. 0113 (Needs <option>-o</option> <replaceable>file</replaceable>) 0114 </para></listitem> 0115 </varlistentry> 0116 0117 <varlistentry> 0118 <term><option>--noauto</option></term> 0119 <listitem><para>Ignore --auto and always show GUI. 0120 </para></listitem> 0121 </varlistentry> 0122 0123 <varlistentry> 0124 <term><option>--L1</option> <replaceable>alias1</replaceable></term> 0125 <listitem><para>Visible name replacement for input file 1 (base). 0126 </para></listitem> 0127 </varlistentry> 0128 0129 <varlistentry> 0130 <term><option>--L2</option> <replaceable>alias2</replaceable></term> 0131 <listitem><para>Visible name replacement for input file 2. 0132 </para></listitem> 0133 </varlistentry> 0134 0135 <varlistentry> 0136 <term><option>--L3</option> <replaceable>alias3</replaceable></term> 0137 <listitem><para>Visible name replacement for input file 3. 0138 </para></listitem> 0139 </varlistentry> 0140 0141 <varlistentry> 0142 <term><option>-L, --fname</option> <replaceable>alias</replaceable></term> 0143 <listitem><para>Alternative visible name replacement. Supply this once for every input. 0144 </para></listitem> 0145 </varlistentry> 0146 0147 <varlistentry> 0148 <term><option>--cs</option> <replaceable>string</replaceable></term> 0149 <listitem><para>Override a config setting. Use once for every setting. 0150 ⪚: <option>--cs</option> <replaceable>AutoAdvance=1</replaceable>. 0151 </para></listitem> 0152 </varlistentry> 0153 0154 <varlistentry> 0155 <term><option>--confighelp</option></term> 0156 <listitem><para>Show list of config settings and current values. 0157 </para></listitem> 0158 </varlistentry> 0159 0160 <varlistentry> 0161 <term><option>--config</option> <replaceable>file</replaceable></term> 0162 <listitem><para>Use a different config file. 0163 </para></listitem> 0164 </varlistentry> 0165 0166 <varlistentry> 0167 <term><option><replaceable>File1</replaceable></option></term> 0168 <listitem><para>file1 to open (base, if not specified via --<option>base</option>) 0169 </para></listitem> 0170 </varlistentry> 0171 0172 <varlistentry> 0173 <term><option><replaceable>File2</replaceable></option></term> 0174 <listitem><para>file2 to open 0175 </para></listitem> 0176 </varlistentry> 0177 0178 <varlistentry> 0179 <term><option><replaceable>File3</replaceable></option></term> 0180 <listitem><para>file3 to open 0181 </para></listitem> 0182 </varlistentry> 0183 0184 </variablelist> 0185 0186 </refsect1> 0187 0188 <refsect1> 0189 <title>See Also</title> 0190 <simplelist> 0191 <member>More detailed user documentation is available from <ulink 0192 url="help:/kdiff3">help:/kdiff3</ulink> 0193 (either enter this &URL; into &konqueror;, or run 0194 <userinput><command>khelpcenter</command> 0195 <parameter>help:/kdiff3</parameter></userinput>).</member> 0196 <member>kf5options(7)</member> 0197 <member>qt5options(7)</member> 0198 </simplelist> 0199 </refsect1> 0200 0201 <refsect1> 0202 <title>Authors</title> 0203 <para>This manual page was written by &Burkhard.Lueck; &Burkhard.Lueck.mail;.</para> 0204 </refsect1> 0205 0206 </refentry>