|
|
|
|
|
<html><head><title>The KDiff3 Handbook</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="description" content="
|
|
|
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
|
|
This document describes KDiff3-version 0.9.92.
|
|
|
|
|
|
"><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="start" href="index.html" title="The KDiff3 Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"><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"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">The <span class="application">KDiff3</span> Handbook</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="introduction.html">Next</a></div><div class="navCenter"> </div></div><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2421696"></a>The <span class="application">KDiff3</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="firstname">Joachim</span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="surname">Eibl</span> <code class="email"><joachim.eibl at gmx.de></code></p></div></div><div>Revision <span class="releaseinfo">0.9.92 (<span class="date">2007-31-03</span>)</span></div><div><p class="copyright">Copyright © 2002-2007 Joachim Eibl</p></div><div><div class="legalnotice"><a name="id2564266"></a><p>Permission is granted to copy, distribute and/or modify this
|
|
|
|
|
|
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 <a href="credits.html#gnu-fdl">the section entitled "GNU Free Documentation License"</a>.</p></div></div><div><div><div class="abstract"><p>
|
|
|
|
|
|
<span class="application">KDiff3</span> is a file and directory diff and merge tool which
|
|
|
|
|
|
<div class="itemizedlist"><ul type="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 <span class="application">KDiff3</span>-version 0.9.92.
|
|
|
|
|
|
</p></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="introduction.html">1. Introduction</a></span></dt><dd><dl><dt><span class="sect1"><a href="introduction.html#why">Yet Another Diff Frontend?</a></span></dt><dt><span class="sect1"><a href="screenshots.html">Screenshots and Features</a></span></dt><dt><span class="sect1"><a href="features.html">More Features</a></span></dt><dd><dl><dt><span class="sect2"><a href="features.html#id2490911"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#id2490942"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#id2490972"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#id2491007"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#id2491031">And ...</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="documentation.html">2. File Comparison And Merge</a></span></dt><dd><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#id2488302">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488321">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488352">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488370">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488418">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488444">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488514">Other command line options</a></span></dt><dt><span class="sect2"><a href="documentation.html#id2488593">Ignorable command line options</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">Comparing Files And Interpreting The Information In The Input Windows</a></span></dt><dd><dl><dt><span class="sect2"><a href="interpretinginformation.html#id2564410">Info Line</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564428">Coloring</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564454">Summary Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#id2564475">Overview Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#manualdiffhelp">Manually Aligning Lines</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#joinsplitsections">Manually Joining and Splitting Diff Sections</a></span></dt></dl></dd><dt><span class="sect1"><a href="merging.html">Merging And The Merge Output Editor Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="merging.html#id2564630">The Summary Column</a></span></dt><dt><span class="sect2"><a href="merging.html#synchronise_views">Setting The Current Group And Synchronising Merge And Diff View Position</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564684">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><span class="sect2"><a href="merging.html#id2564761">Choosing Input A, B, or C for All Conflicts</a></span></dt><dt><span class="sect2"><a href="merging.html#vcskeywordsmergesupport">Automatic Merge of Version Control Keywords and History (Log)</a></span></dt></dl></dd><dt><span class="sect1"><a href="navigation.html">Navigation And Editing</a></span></dt><dd><dl><dt><span class="sect2"><a href="navigation.html#autoadvance">Auto-Advance</a></span></dt></dl></dd><dt><span class="sect1"><a href="selections.html">Select, Copy And Pa
|
|
|
|
|
|
Send feedback to the <a href="mailto:kde-docs@kdemail.net" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html>
|
