KDiff3 is a file and directory diff and merge tool which
compares and merges two or three text input files or directories,shows the differences line by line and character by character(!),provides an automatic merge-facility,has an editor for comfortable solving of merge-conflicts,provides networktransparency via KIO,has options to highlight or hide changes in white-space or comments,supports Unicode, UTF-8 and other file encodings,prints differences,supports version control keyword and history merging.
document under the terms of the GNU Free Documentation License,
Version 1.1 or any later version published by the Free Software
Foundation; with no Invariant Sections, with no Front-Cover Texts, and
with no Back-Cover Texts. A copy of the license is included in <ahref="credits.html#gnu-fdl">the section entitled "GNU Free Documentation License"</a>.</p></div></div><div><div><divclass="abstract"><p>
<spanclass="application">KDiff3</span> is a file and directory diff and merge tool which
<divclass="itemizedlist"><ultype="disc"><li><p>compares and merges two or three text input files or directories,</p></li><li><p>shows the differences line by line and character by character(!),</p></li><li><p>provides an automatic merge-facility,</p></li><li><p>has an editor for comfortable solving of merge-conflicts,</p></li><li><p>provides networktransparency via KIO,</p></li><li><p>has options to highlight or hide changes in white-space or comments,</p></li><li><p>supports Unicode, UTF-8 and other file encodings,</p></li><li><p>prints differences,</p></li><li><p>supports version control keyword and history merging.</p></li></ul></div>
</p><p>
This document describes <spanclass="application">KDiff3</span>-version 0.9.92.
</p></div></div></div></div><hr></div><divclass="toc"><p><b>Table of Contents</b></p><dl><dt><spanclass="chapter"><ahref="introduction.html">1. Introduction</a></span></dt><dd><dl><dt><spanclass="sect1"><ahref="introduction.html#why">Yet Another Diff Frontend?</a></span></dt><dt><spanclass="sect1"><ahref="screenshots.html">Screenshots and Features</a></span></dt><dt><spanclass="sect1"><ahref="features.html">More Features</a></span></dt><dd><dl><dt><spanclass="sect2"><ahref="features.html#id2490911"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><spanclass="sect2"><ahref="features.html#id2490942"> See White-Space Differences At One Glance</a></span></dt><dt><spanclass="sect2"><ahref="features.html#id2490972"> Triple-Diff</a></span></dt><dt><spanclass="sect2"><ahref="features.html#id2491007"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><spanclass="sect2"><ahref="features.html#id2491031">And ...</a></span></dt></dl></dd></dl></dd><dt><spanclass="chapter"><ahref="documentation.html">2. File Comparison And Merge</a></span></dt><dd><dl><dt><spanclass="sect1"><ahref="documentation.html#commandline">Command-Line Options</a></span></dt><dd><dl><dt><spanclass="sect2"><ahref="documentation.html#id2488302">Comparing 2 files: </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488321">Merging 2 files: </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488352">Comparing 3 files: </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488370">Merging 3 files: </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488418">Special case: Files with the same name </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488444">Commandline for starting a directory comparison or merge: </a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488514">Other command line options</a></span></dt><dt><spanclass="sect2"><ahref="documentation.html#id2488593">Ignorable command line options</a></span></dt></dl></dd><dt><spanclass="sect1"><ahref="opendialog.html">Open-Dialog</a></span></dt><dt><spanclass="sect1"><ahref="pasteinput.html">Paste and Drop Input</a></span></dt><dt><spanclass="sect1"><ahref="interpretinginformation.html">Comparing Files And Interpreting The Information In The Input Windows</a></span></dt><dd><dl><dt><spanclass="sect2"><ahref="interpretinginformation.html#id2564410">Info Line</a></span></dt><dt><spanclass="sect2"><ahref="interpretinginformation.html#id2564428">Coloring</a></span></dt><dt><spanclass="sect2"><ahref="interpretinginformation.html#id2564454">Summary Column</a></span></dt><dt><spanclass="sect2"><ahref="interpretinginformation.html#id2564475">Overview Column</a></span></dt><dt><spanclass="sect2"><ahref="interpretinginformation.html#manualdiffhelp">Manually Aligning Lines</a></span></dt><dt><spanclass="sect2"><ahref="interpretinginformation.html#joinsplitsections">Manually Joining and Splitting Diff Sections</a></span></dt></dl></dd><dt><spanclass="sect1"><ahref="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dd><dl><dt><spanclass="sect2"><ahref="merging.html#id2564630">The Summary Column</a></span></dt><dt><spanclass="sect2"><ahref="merging.html#synchronise_views">Setting The Current Group And Synchronising Merge And Diff View Position</a></span></dt><dt><spanclass="sect2"><ahref="merging.html#id2564684">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><spanclass="sect2"><ahref="merging.html#id2564761">Choosing Input A, B, or C for All Conflicts</a></span></dt><dt><spanclass="sect2"><ahref="merging.html#vcskeywordsmergesupport">Automatic Merge of Version Control Keywords and History (Log)</a></span></dt></dl></dd><dt><spanclass="sect1"><ahref="navigation.html">Navigation And Editing</a></span></dt><dd><dl><dt><spanclass="sect2"><ahref="navigation.html#autoadvance">Auto-Advance</a></span></dt></dl></dd><dt><spanclass="sect1"><ahref="selections.html">Select, Copy And Pa
Send feedback to the <ahref="mailto:kde-docs@kdemail.net"style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>