/usr/share/doc/kdiff3-doc/html/index.html is in kdiff3-doc 0.9.98-2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 | <html><head><title>The KDiff3 Handbook</title><link rel="stylesheet" type="text/css" href="help:/common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><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="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=ISO-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/common/top-kde.jpg" width="36" height="34"> The <span class="application">KDiff3</span> Handbook</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="introduction.html">Next</a></td></tr></table></div><div id="contentBody"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="idm140518491281680"></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> <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><p><a href="help:/common/fdl-notice.html">Legal Notice</a></p></div><div><div><div class="abstract"><p>
<span class="application">KDiff3</span> is a file and directory diff and merge tool which
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>compares and merges two or three text input files or directories,</p></li><li class="listitem"><p>shows the differences line by line and character by character(!),</p></li><li class="listitem"><p>provides an automatic merge-facility,</p></li><li class="listitem"><p>has an editor for comfortable solving of merge-conflicts,</p></li><li class="listitem"><p>provides networktransparency via KIO,</p></li><li class="listitem"><p>has options to highlight or hide changes in white-space or comments,</p></li><li class="listitem"><p>supports Unicode, UTF-8 and other file encodings,</p></li><li class="listitem"><p>prints differences,</p></li><li class="listitem"><p>supports version control keyword and history merging.</p></li></ul></div><p>
</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 class="toc"><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#idm140518484235488"> Line-By-Line And Char-By-Char Diff-Viewer</a></span></dt><dt><span class="sect2"><a href="features.html#idm140518484232528"> See White-Space Differences At One Glance</a></span></dt><dt><span class="sect2"><a href="features.html#idm140518484229856"> Triple-Diff</a></span></dt><dt><span class="sect2"><a href="features.html#idm140518484314016"> Comfortable Merge Of Two Or Three Input Files</a></span></dt><dt><span class="sect2"><a href="features.html#idm140518484312048">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#idm140518484300000">Comparing 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484298112">Merging 2 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484294912">Comparing 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484293024">Merging 3 files: </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484288032">Special case: Files with the same name </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484285584">Commandline for starting a directory comparison or merge: </a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484278656">Other command line options</a></span></dt><dt><span class="sect2"><a href="documentation.html#idm140518484271840">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#idm140518484195264">Info Line</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#idm140518484193824">Coloring</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#idm140518484191728">Summary Column</a></span></dt><dt><span class="sect2"><a href="interpretinginformation.html#idm140518484190112">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#idm140518484178064">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#idm140518484174400">Choosing Inputs A, B or C For Current Conflict And Editing</a></span></dt><dt><span class="sect2"><a href="merging.html#idm140518484168768">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 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="printing.html">Printing</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#idm140518484113440">Font</a></span></dt><dt><span class="sect2"><a href="options.html#idm140518484110528">Colors</a></span></dt><dt><span class="sect2"><a href="options.html#idm140518484094096">Editor Settings</a></span></dt><dt><span class="sect2"><a href="options.html#diffoptions">Diff Settings</a></span></dt><dt><span class="sect2"><a href="options.html#mergeoptions">Merge Settings</a></span></dt><dt><span class="sect2"><a href="options.html#idm140518484055536">Directory Merge</a></span></dt><dt><span class="sect2"><a href="options.html#idm140518484051744">Regional and Language Options</a></span></dt><dt><span class="sect2"><a href="options.html#idm140518484040128">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"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>sed</strong></span></span> Basics</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#sedforkdiff3">Examples For <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>sed</strong></span></span>-Use In <span class="application">KDiff3</span></a></span></dt><dt><span class="sect2"><a href="preprocessors.html#idm140518483975936">Order Of Preprocessor Execution</a></span></dt><dt><span class="sect2"><a href="preprocessors.html#idm140518483970352">Warning</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="dirmerge.html">3. Directory Comparison and Merge with <span class="application">KDiff3</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="dirmerge.html#dirmergeintro">Introduction into Directory Comparison and Merge</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#idm140518483953744">Compare/Merge two directories: </a></span></dt><dt><span class="sect2"><a href="startingdirmerge.html#idm140518483949648">Compare/Merge three directories: </a></span></dt></dl></dd><dt><span class="sect1"><a href="dirmergevisible.html">Directory Merge 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><dt><span class="sect2"><a href="dirmergevisible.html#selectingvisiblefiles">Selecting Listed Files</a></span></dt></dl></dd><dt><span class="sect1"><a href="dothemerge.html">Doing A Directory 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 in Directory Merge Window</a></span></dt><dd><dl><dt><span class="sect2"><a href="other.html#idm140518483853136">Split/Full Screen Mode</a></span></dt><dt><span class="sect2"><a href="other.html#idm140518483851648">Comparing or Merging a Single File</a></span></dt><dt><span class="sect2"><a href="other.html#idm140518483849808">Comparing or Merging Files with Different Names</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#idm140518483845280">KIO-Slaves</a></span></dt><dt><span class="sect2"><a href="misc.html#idm140518483836400">How To Write URLs</a></span></dt><dt><span class="sect2"><a href="misc.html#idm140518483833168">Capabilities of KIO-Slaves</a></span></dt></dl></dd><dt><span class="sect1"><a href="kpart.html">Using <span class="application">KDiff3</span> 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 <span class="application">KDiff3</span></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></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="introduction.html">Next</a></td></tr><tr><td class="prevCell"> </td><td class="upCell"> </td><td class="nextCell"> Introduction</td></tr></table></div><div id="footer_text">Would you like to make a comment or contribute an update to this page?<br>Send feedback to the <a href="mailto:kde-doc-english@kde.org" class="footer_email">KDE Docs Team</a></div></div></div></body></html>
|