<html><head><title>Chapter 2. Documentation of File Comparison And Merge</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="home" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="previous" href="features.html" title="More Features"><link rel="next" href="opendialog.html" title="Open-Dialog"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Documentation of File Comparison And Merge</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="features.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> <a accesskey="n" href="opendialog.html">Next</a></td></tr></tbody></table><div class="chapter" lang="en"><div class="titlepage"><div><div><h2 class="title"><a name="documentation"></a>Chapter 2. Documentation of File Comparison And Merge</h2></div></div><div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="documentation.html#commandline">Command-Line Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="documentation.html#id2475748">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475767">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475798">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475816">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475863">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475889">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2475958">For more information on command line options use: </a></span></dt></dl></dd><dt><span class="sect1"><a href="opendialog.html">Open-Dialog</a></span></dt><dt><span class="sect1"><a href="pasteinput.html">Paste and Drop Input</a></span></dt><dt><span class="sect1"><a href="interpretinginformation.html">Interpreting The Information In The Input Windows</a></span></dt><dt><span class="sect1"><a href="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dt><span class="sect1"><a href="navigation.html">Navigation And Editing</a></span></dt><dt><span class="sect1"><a href="selections.html">Select, Copy And Paste</a></span></dt><dt><span class="sect1"><a href="saving.html">Saving</a></span></dt><dt><span class="sect1"><a href="find.html">Finding Strings</a></span></dt><dt><span class="sect1"><a href="options.html">Options</a></span></dt><dd><dl><dt><span class="sect2"><a href="options.html#id2538197">Font</a></span></dt><dt><span class="sect2"><a href="options.html#id2538228">Colors</a></span></dt><dt><span class="sect2"><a href="options.html#id2538342">Editor Settings</a></span></dt><dt><span class="sect2"><a href="options.html#id2539185">Diff & Merge Settings</a></span></dt><dt><span class="sect2"><a href="options.html#id2539328">Directory Merge</a></span></dt><dt><span class="sect2"><a href="options.html#id2539363">Regional and Language Options</a></span></dt><dt><span class="sect2"><a href="options.html#id2539464">Miscellaneous</a></span></dt><dt><span class="sect2"><a href="options.html#shortcuts">Configuring Keyboard-Shortcuts</a></span></dt></dl></dd><dt><span class="sect1"><a href="preprocessors.html">Preprocessor Commands</a></span></dt><dd><dl><dt><span class="sect2"><a href="preprocessors.html#sedbasics">sed Basics</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#sedforkdiff3">Examples For sed-Use In KDiff3</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2540145">Order Of Preprocessor Execution</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#id2540207">Warning</a></span></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="commandline"></a>Command-Line Options</h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475748"></a>Comparing 2 files: </h3></div></div><div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2</tt></i></span> </pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475767"></a>Merging 2 files: </h3></div></div><div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2</tt></i></span> -m <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2</tt></i></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>outputfile</tt></i></span> </pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475798"></a>Comparing 3 files: </h3></div></div><div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2 file3</tt></i></span> </pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475816"></a>Merging 3 files: </h3></div></div><div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2 file3</tt></i></span> -m <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1 file2 file3</tt></i></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>outputfile</tt></i></span> </pre><p> Note that <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file1</tt></i></span> will be treated as base of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file2</tt></i></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>file3</tt></i></span>. </p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475863"></a>Special case: Files with the same name </h3></div></div><div></div></div><p> If all files have the same name but are in different directories, you can reduce typework by specifying the filename only for the first file. E.g.: </p><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>dir1/filename dir2 dir3</tt></i></span> </pre></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475889"></a>Commandline for starting a directory comparison or merge: </h3></div></div><div></div></div><p>This is very similar, but now it's about directories.</p><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>dir1 dir2</tt></i></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>dir1 dir2</tt></i></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>destdir</tt></i></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>dir1 dir2 dir3</tt></i></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>dir1 dir2 dir3</tt></i></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><i class="replaceable"><tt>destdir</tt></i></span> </pre><p>For directory comparison and merge you can continue to read <a href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3">here</a>.</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2475958"></a>For more information on command line options use: </h3></div></div><div></div></div><pre class="screen"> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><b class="command">kdiff3</b></span></span> --help Options: -m, --merge Merge the input. -b, --base file Explicit base file. For compatibility with certain tools. -o, --output file Output file. Implies -m. E.g.: -o newfile.txt --out file Output file, again. (For compatibility with certain tools.) --auto No GUI if all conflicts are auto-solvable. (Needs -o file) --qall Don't solve conflicts automatically. (For compatibility...) --L1 alias1 Visible name replacement for input file 1 (base). --L2 alias2 Visible name replacement for input file 2. --L3 alias3 Visible name replacement for input file 3. -L, --fname alias Alternative visible name replacement. Supply this once for every input. -u Has no effect. For compatibility with certain tools. </pre></div></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="features.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="opendialog.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">More Features </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Open-Dialog</td></tr></table></body></html>
distrib
>
Mandriva
>
10.2
>
i586
>
media
>
contrib
>
by-pkgid
>
a1a8a1511d610277a926fcdfef64386b
>
files
>
44
