Sophie: kdiff3-0.9.88-1mdk i586

kdiff3-0.9.88-1mdk.i586.rpm

<html><head><title>The KDiff3 Handbook</title><link rel="stylesheet" href="common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><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.
 
   This document describes KDiff3-version 0.9.87.
"><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="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"><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>The KDiff3 Handbook</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
		      <a accesskey="n" href="introduction.html">Next</a></td></tr></tbody></table><div class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="id2413298"></a>The <span class="application">KDiff3</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span class="firstname">Joachim</span> <span class="surname">Eibl</span> <tt class="email">&lt;joachim.eibl at gmx.de&gt;</tt></p></div></div><div>Revision <span class="releaseinfo">0.9.87 (<span class="date">2005-01-30</span>)</span></div><div><p class="copyright">Copyright © 2002-2005 Joachim Eibl</p></div><div><div class="legalnotice"><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></p><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></ul></div>
</p><p>
   This document describes KDiff3-version 0.9.87.
</p></div></div></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#id2525905"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#id2525932"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#id2525961"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#id2525997"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#id2526024">And ...</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="documentation.html">2. Documentation of 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#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 &amp; 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></dd><dt><span class="chapter"><a href="dirmerge.html">3. Directory Comparison and Merge with KDiff3</a></span></dt><dd><dl><dt><span class="sect1"><a href="dirmerge.html#dirmergeintro">Introduction</a></span></dt><dt><span class="sect1"><a href="startingdirmerge.html">Starting Directory Comparison Or Merge</a></span></dt><dd><dl><dt><span class="sect2"><a href="startingdirmerge.html#id2540384">Compare/Merge two directories: </a></span></dt><dt><span class="sect2"><a href="startingdirmerge.html#id2540424">Compare/Merge three directories: </a></span></dt></dl></dd><dt><span class="sect1"><a href="dirmergevisible.html">Visible Information</a></span></dt><dd><dl><dt><span class="sect2"><a href="dirmergevisible.html#name">The Name Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#coloring">The Columns A/B/C and the Coloring Scheme</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#operation">The Operation Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#status">The Status Column</a></span></dt><dt><span class="sect2"><a href="dirmergevisible.html#statisticscolulmns">Statistics Columns</a></span></dt></dl></dd><dt><span class="sect1"><a href="dothemerge.html">Doing A Merge</a></span></dt><dt><span class="sect1"><a href="dirmergeoptions.html">Options for Comparing and Merging Directories</a></span></dt><dt><span class="sect1"><a href="other.html">Other Functions</a></span></dt><dd><dl><dt><span class="sect2"><a href="other.html#id2541372">Split/Full Screen Mode</a></span></dt><dt><span class="sect2"><a href="other.html#id2541398">Comparing or Merging a Single File</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="misc.html">4. Miscellaneous Topics</a></span></dt><dd><dl><dt><span class="sect1"><a href="misc.html#networktransparency">Networktransparency via KIO</a></span></dt><dd><dl><dt><span class="sect2"><a href="misc.html#id2541445">KIO-Slaves</a></span></dt><dt><span class="sect2"><a href="misc.html#id2541539">How To Write URLs</a></span></dt><dt><span class="sect2"><a href="misc.html#id2541575">Capabilities of KIO-Slaves</a></span></dt></dl></dd><dt><span class="sect1"><a href="kpart.html">Using KDiff3 as a KPart</a></span></dt></dl></dd><dt><span class="chapter"><a href="faq.html">5. Questions and Answers</a></span></dt><dt><span class="chapter"><a href="credits.html">6. Credits and License</a></span></dt><dt><span class="appendix"><a href="installation.html">A. Installation</a></span></dt><dd><dl><dt><span class="sect1"><a href="installation.html#getting-kdiff3">How to obtain KDiff3</a></span></dt><dt><span class="sect1"><a href="requirements.html">Requirements</a></span></dt><dt><span class="sect1"><a href="compilation.html">Compilation and Installation</a></span></dt></dl></dd></dl></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"></td><td width="34%" align="center" valign="top" class="navCenter"> </td><td width="33%" align="right" valign="top" class="navRight"><a href="introduction.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft"> </td><td width="34%" align="center" class="navCenter"> </td><td width="33%" align="right" class="navRight"> Introduction</td></tr></table></body></html>