| Offset 1, 13 lines modified | Offset 1, 13 lines modified |
| 1 | <FILENAME·filename="index.html"><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.76.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,·mer·✂ | 1 | <FILENAME·filename="index.html"><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.76.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,·mer·✂ |
| 2 | ···<span·class="application">KDiff3</span>·is·a·file·and·directory·diff·and·merge·tool·which | 2 | ···<span·class="application">KDiff3</span>·is·a·file·and·directory·diff·and·merge·tool·which |
| 3 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·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> | 3 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·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> |
| 4 | </p><p> | 4 | </p><p> |
| 5 | ···This·document·describes·<span·class="application">KDiff3</span>-version·0.9.92. | 5 | ···This·document·describes·<span·class="application">KDiff3</span>-version·0.9.92. |
| 6 | </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#idp148708536">·Line-By-Line·And·Char-By-Char·Diff-Viewer</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148711096">·See·White-Space·Differences·At·One·Glance</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148713272">·Triple-Diff</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148715960">·Comfortable·Merge·Of·Two·Or·Three·Input·Files</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148717368">And·...</a></span></dt></dl></dd></dl></dd><dt><span·cla·✂ | 6 | </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#idp148733112">·Line-By-Line·And·Char-By-Char·Diff-Viewer</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148735672">·See·White-Space·Differences·At·One·Glance</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148737848">·Triple-Diff</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148740536">·Comfortable·Merge·Of·Two·Or·Three·Input·Files</a></span></dt><dt><span·class="sect2"><a·href="features.html#idp148741944">And·...</a></span></dt></dl></dd></dl></dd><dt><span·cla·✂ |
| 7 | Several·graphical·diff·tools·exist.·Why·choose·<span·class="application">KDiff3</span>?·Let·me·say,·why·I·wrote·it. | 7 | Several·graphical·diff·tools·exist.·Why·choose·<span·class="application">KDiff3</span>?·Let·me·say,·why·I·wrote·it. |
| 8 | </p><p> | 8 | </p><p> |
| 9 | <span·class="application">KDiff3</span>·started·because·I·had·to·do·a·difficult·merge.·Merging·is·necessary·when·several | 9 | <span·class="application">KDiff3</span>·started·because·I·had·to·do·a·difficult·merge.·Merging·is·necessary·when·several |
| 10 | people·work·on·the·same·files·in·a·project.·A·merge·can·be·somewhat·automated,·when·the | 10 | people·work·on·the·same·files·in·a·project.·A·merge·can·be·somewhat·automated,·when·the |
| 11 | merge-tool·not·only·has·the·new·modified·files·(called·"branches"),·but·also·the·original·file | 11 | merge-tool·not·only·has·the·new·modified·files·(called·"branches"),·but·also·the·original·file |
| 12 | (called·"base").·The·merge·tool·will·automatically·choose·any·modification·that·was·only | 12 | (called·"base").·The·merge·tool·will·automatically·choose·any·modification·that·was·only |
| 13 | done·in·one·branch.·When·several·contributors·change·the·same·lines,·then·the·merge·tool | 13 | done·in·one·branch.·When·several·contributors·change·the·same·lines,·then·the·merge·tool |
| Offset 42, 59 lines modified | Offset 42, 59 lines modified |
| 42 | ···This·screenshot·shows·three·input·files·being·merged: | 42 | ···This·screenshot·shows·three·input·files·being·merged: |
| 43 | </p><p> | 43 | </p><p> |
| 44 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="screenshot_merge.png"><hr></div></div><p> | 44 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="screenshot_merge.png"><hr></div></div><p> |
| 45 | </p><p><a·name="dirmergebigscreenshot"></a><span·class="application">KDiff3</span>·also·helps·you·to·compare·and·merge·complete·directories. | 45 | </p><p><a·name="dirmergebigscreenshot"></a><span·class="application">KDiff3</span>·also·helps·you·to·compare·and·merge·complete·directories. |
| 46 | This·screenshot·shows·<span·class="application">KDiff3</span>·during·a·directory·merge: | 46 | This·screenshot·shows·<span·class="application">KDiff3</span>·during·a·directory·merge: |
| 47 | </p><p> | 47 | </p><p> |
| 48 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="dirmergebig.png"><hr></div></div><p> | 48 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="dirmergebig.png"><hr></div></div><p> |
| 49 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="introduction.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="features.html">Next</a></td></tr><tr><td·class="prevCell">Introduction </td><td·class="upCell">Introduction</td><td·class="nextCell"> More·Features</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></FILENAME><FILENAME·filename="features.html"><html><head><title>More·Features</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="DocBoo·✂ | 49 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="introduction.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="features.html">Next</a></td></tr><tr><td·class="prevCell">Introduction </td><td·class="upCell">Introduction</td><td·class="nextCell"> More·Features</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></FILENAME><FILENAME·filename="features.html"><html><head><title>More·Features</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="DocBoo·✂ |
| 50 | ···exactly·what·the·difference·is.·When·you·have·to·do·many·code-reviews,·you·will·like·this. | 50 | ···exactly·what·the·difference·is.·When·you·have·to·do·many·code-reviews,·you·will·like·this. |
| 51 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="letter_by_letter.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148711096"></a>·See·White-Space·Differences·At·One·Glance</h3></div></div></div><p>Spaces·and·tabs·that·differ·appear·visibly.·When·lines·differ·only | 51 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="letter_by_letter.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148735672"></a>·See·White-Space·Differences·At·One·Glance</h3></div></div></div><p>Spaces·and·tabs·that·differ·appear·visibly.·When·lines·differ·only |
| 52 | ···in··the··amount·of·white·space·this·can·be·seen·at·one·look·in·the·summary | 52 | ···in··the··amount·of·white·space·this·can·be·seen·at·one·look·in·the·summary |
| 53 | ···column·on·the·left·side.·(No·more·worries·when·people·change·the·indentation.) | 53 | ···column·on·the·left·side.·(No·more·worries·when·people·change·the·indentation.) |
| 54 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="white_space.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148713272"></a>·Triple-Diff</h3></div></div></div><p>·Analyze·three·files·and·see·where·they·differ. | 54 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="white_space.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148737848"></a>·Triple-Diff</h3></div></div></div><p>·Analyze·three·files·and·see·where·they·differ. |
| 55 | </p><p> | 55 | </p><p> |
| 56 | ···The·left/middle/right·windows·are·named·A/B/C·and·have·the·blue/green/magenta | 56 | ···The·left/middle/right·windows·are·named·A/B/C·and·have·the·blue/green/magenta |
| 57 | ···color·respectively. | 57 | ···color·respectively. |
| 58 | </p><p> | 58 | </p><p> |
| 59 | ···If·one·file·is·the·same·and·one·file·is·different·on·a·line·then·the | 59 | ···If·one·file·is·the·same·and·one·file·is·different·on·a·line·then·the |
| 60 | ···color···shows·which·file·is·different.·The·red·color·means·that·both·other | 60 | ···color···shows·which·file·is·different.·The·red·color·means·that·both·other |
| 61 | ···files··are·different. | 61 | ···files··are·different. |
| 62 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="triple_diff.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148715960"></a>·Comfortable·Merge·Of·Two·Or·Three·Input·Files</h3></div></div></div><p>·<span·class="application">KDiff3</span>·can·be·used·to·merge·two·or·three·input·files·and·automatically | 62 | </p><div·class="screenshot"><div·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="mediaobject"><hr><img·src="triple_diff.png"><hr></div></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148740536"></a>·Comfortable·Merge·Of·Two·Or·Three·Input·Files</h3></div></div></div><p>·<span·class="application">KDiff3</span>·can·be·used·to·merge·two·or·three·input·files·and·automatically |
| 63 | ···merges·as·much·as·possible.·The·result·is·presented·in·an·editable·window | 63 | ···merges·as·much·as·possible.·The·result·is·presented·in·an·editable·window |
| 64 | ···where·most·conflicts·can·be·solved·with·a·single·mouseclick:·Select·the | 64 | ···where·most·conflicts·can·be·solved·with·a·single·mouseclick:·Select·the |
| 65 | ···buttons··A/B/C·from·the·button-bar·to·select·the·source·that·should·be·used. | 65 | ···buttons··A/B/C·from·the·button-bar·to·select·the·source·that·should·be·used. |
| 66 | ···You·can··also·select·more·than·one·source.·Since·this·output·window·is·an | 66 | ···You·can··also·select·more·than·one·source.·Since·this·output·window·is·an |
| 67 | ···editor·even··conflicts·which·need·further·corrections·can·be·solved·here·without | 67 | ···editor·even··conflicts·which·need·further·corrections·can·be·solved·here·without |
| 68 | ···requiring··another·tool. | 68 | ···requiring··another·tool. |
| 69 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148717368"></a>And·...</h3></div></div></div><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Fast·navigation·via·buttons.</p></li><li·class="listitem"><p>A·mouse-click·into·a·summary·column·sync's·all·windows·to·show·the·same·position.</p></li><li·class="listitem"><p>Select·and·copy·from·any·window·and·paste·into·the·merge·result·window.</p></li><li·class="listitem"><p>Overview·column·that·shows·where·the·changes·and·conflicts·are.</p></li><li·class="listitem"><p>The·colors·are·adjustable·to·your·specific·preferences.</p></li><li·class="listitem"><p>Adjustable·Tab·size.</p></li><li·class="listitem"><p>Option·to·insert·spaces·instead·of·tabs.</p></li><li·class="listitem"><p>Open·files·comfortably·via·dialog·or·specify·files·on·the·command·line.</p></li><li·class="listitem"><p>Search·for·strings·in·all·text·windows.·Find·(Ctrl-F)·and·Find·Next·(F3)</p></li><li·class="listitem"><p>Sh·✂ | 69 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148741944"></a>And·...</h3></div></div></div><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Fast·navigation·via·buttons.</p></li><li·class="listitem"><p>A·mouse-click·into·a·summary·column·sync's·all·windows·to·show·the·same·position.</p></li><li·class="listitem"><p>Select·and·copy·from·any·window·and·paste·into·the·merge·result·window.</p></li><li·class="listitem"><p>Overview·column·that·shows·where·the·changes·and·conflicts·are.</p></li><li·class="listitem"><p>The·colors·are·adjustable·to·your·specific·preferences.</p></li><li·class="listitem"><p>Adjustable·Tab·size.</p></li><li·class="listitem"><p>Option·to·insert·spaces·instead·of·tabs.</p></li><li·class="listitem"><p>Open·files·comfortably·via·dialog·or·specify·files·on·the·command·line.</p></li><li·class="listitem"><p>Search·for·strings·in·all·text·windows.·Find·(Ctrl-F)·and·Find·Next·(F3)</p></li><li·class="listitem"><p>Sh·✂ |
| 70 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span> | 70 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span> |
| 71 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148734520"></a>Merging·2·files:·</h3></div></div></div><pre·class="screen"> | 71 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148759096"></a>Merging·2·files:·</h3></div></div></div><pre·class="screen"> |
| 72 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span>·-m | 72 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span>·-m |
| 73 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>outputfile</code></em></span> | 73 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>outputfile</code></em></span> |
| 74 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148737464"></a>Comparing·3·files:·</h3></div></div></div><pre·class="screen"> | 74 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148762040"></a>Comparing·3·files:·</h3></div></div></div><pre·class="screen"> |
| 75 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span> | 75 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span> |
| 76 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148739256"></a>Merging·3·files:·</h3></div></div></div><pre·class="screen"> | 76 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148763832"></a>Merging·3·files:·</h3></div></div></div><pre·class="screen"> |
| 77 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span>·-m | 77 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span>·-m |
| 78 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>outputfile</code></em></span> | 78 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1·file2·file3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>outputfile</code></em></span> |
| 79 | </pre><p> | 79 | </pre><p> |
| 80 | ···Note·that·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1</code></em></span>·will·be·treated·as | 80 | ···Note·that·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file1</code></em></span>·will·be·treated·as |
| 81 | ···base·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file2</code></em></span>·and | 81 | ···base·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file2</code></em></span>·and |
| 82 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file3</code></em></span>. | 82 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>file3</code></em></span>. |
| 83 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148743736"></a>Special·case:·Files·with·the·same·name·</h3></div></div></div><p> | 83 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148768312"></a>Special·case:·Files·with·the·same·name·</h3></div></div></div><p> |
| 84 | If·all·files·have·the·same·name·but·are·in·different·directories,·you·can | 84 | If·all·files·have·the·same·name·but·are·in·different·directories,·you·can |
| 85 | reduce·typework·by·specifying·the·filename·only·for·the·first·file.·E.g.: | 85 | reduce·typework·by·specifying·the·filename·only·for·the·first·file.·E.g.: |
| 86 | </p><pre·class="screen"> | 86 | </p><pre·class="screen"> |
| 87 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1/filename·dir2·dir3</code></em></span> | 87 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1/filename·dir2·dir3</code></em></span> |
| 88 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148745912"></a>Commandline·for·starting·a·directory·comparison·or·merge:·</h3></div></div></div><p>This·is·very·similar,·but·now·it's·about·directories.</p><pre·class="screen"> | 88 | </pre></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148770488"></a>Commandline·for·starting·a·directory·comparison·or·merge:·</h3></div></div></div><p>This·is·very·similar,·but·now·it's·about·directories.</p><pre·class="screen"> |
| 89 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span> | 89 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span> |
| 90 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> | 90 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> |
| 91 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span> | 91 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span> |
| 92 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> | 92 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> |
| 93 | </pre><p>For·directory·comparison·and·merge·you·can·continue·to·read·<a·class="link"·href="dirmerge.html"·title="Chapter 3. Directory·Comparison·and·Merge·with·KDiff3">here</a>.</p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148752056"></a>Other·command·line·options</h3></div></div></div><p>To·see·all·available·command·line·options·type</p><pre·class="screen"> | 93 | </pre><p>For·directory·comparison·and·merge·you·can·continue·to·read·<a·class="link"·href="dirmerge.html"·title="Chapter 3. Directory·Comparison·and·Merge·with·KDiff3">here</a>.</p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148776632"></a>Other·command·line·options</h3></div></div></div><p>To·see·all·available·command·line·options·type</p><pre·class="screen"> |
| 94 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·--help | 94 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·--help |
| 95 | </pre><p>Example·output:</p><pre·class="screen"> | 95 | </pre><p>Example·output:</p><pre·class="screen"> |
| 96 | Options: | 96 | Options: |
| 97 | ··-m,·--merge···············Merge·the·input. | 97 | ··-m,·--merge···············Merge·the·input. |
| 98 | ··-b,·--base·file···········Explicit·base·file.·For·compatibility·with·certain·tools. | 98 | ··-b,·--base·file···········Explicit·base·file.·For·compatibility·with·certain·tools. |
| 99 | ··-o,·--output·file·········Output·file.·Implies·-m.·E.g.:·-o·newfile.txt | 99 | ··-o,·--output·file·········Output·file.·Implies·-m.·E.g.:·-o·newfile.txt |
| 100 | ··--out·file················Output·file,·again.·(For·compatibility·with·certain·tools.) | 100 | ··--out·file················Output·file,·again.·(For·compatibility·with·certain·tools.) |
| Offset 106, 15 lines modified | Offset 106, 15 lines modified |
| 106 | ··-L,·--fname·alias·········Alternative·visible·name·replacement.·Supply·this·once·for·every·input. | 106 | ··-L,·--fname·alias·········Alternative·visible·name·replacement.·Supply·this·once·for·every·input. |
| 107 | ··--cs·string···············Override·a·config·setting.·Use·once·for·every·setting.·E.g.:·--cs·"AutoAdvance=1" | 107 | ··--cs·string···············Override·a·config·setting.·Use·once·for·every·setting.·E.g.:·--cs·"AutoAdvance=1" |
| 108 | ··--confighelp··············Show·list·of·config·settings·and·current·values. | 108 | ··--confighelp··············Show·list·of·config·settings·and·current·values. |
| 109 | ··--config·file·············Use·a·different·config·file. | 109 | ··--config·file·············Use·a·different·config·file. |
| 110 | </pre><p>The·option·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--cs</code></span>·allows·you·to·adjust·a·configuration·value·that·is·otherwise·only·adjustable·via·the·configure·dialogs.· | 110 | </pre><p>The·option·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--cs</code></span>·allows·you·to·adjust·a·configuration·value·that·is·otherwise·only·adjustable·via·the·configure·dialogs.· |
| 111 | But·be·aware·that·when·<span·class="application">KDiff3</span>·then·terminates·the·changed·value·will·be·stored·along·with·the·other·settings.· | 111 | But·be·aware·that·when·<span·class="application">KDiff3</span>·then·terminates·the·changed·value·will·be·stored·along·with·the·other·settings.· |
| 112 | With·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--confighelp</code></span>·you·can·find·out·the·names·of·the·available·items·and·current·values.</p><p>Via·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--config</code></span>·you·can·specify·a·different·config·file.·When·you·often·use·<span·class="application">KDiff3</span>· | 112 | With·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--confighelp</code></span>·you·can·find·out·the·names·of·the·available·items·and·current·values.</p><p>Via·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="option"><code·class="option">--config</code></span>·you·can·specify·a·different·config·file.·When·you·often·use·<span·class="application">KDiff3</span>· |
| 113 | with·completely·different·setups·this·allows·you·to·easily·switch·between·them.</p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148757304"></a>Ignorable·command·line·options</h3></div></div></div><p>Many·people·want·to·use·<span·class="application">KDiff3</span>·with·some·version·control·system.· | 113 | with·completely·different·setups·this·allows·you·to·easily·switch·between·them.</p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148781880"></a>Ignorable·command·line·options</h3></div></div></div><p>Many·people·want·to·use·<span·class="application">KDiff3</span>·with·some·version·control·system.· |
| 114 | But·when·that·version·control·system·calls·<span·class="application">KDiff3</span>·using·command·line·parameters·that·<span·class="application">KDiff3</span>·doesn't·recognise,·then·<span·class="application">KDiff3</span>·terminates·with·an·error. | 114 | But·when·that·version·control·system·calls·<span·class="application">KDiff3</span>·using·command·line·parameters·that·<span·class="application">KDiff3</span>·doesn't·recognise,·then·<span·class="application">KDiff3</span>·terminates·with·an·error. |
| 115 | The·integration·settings·allow·to·specify·command·line·parameters·that·should·be·ignored·by·<span·class="application">KDiff3</span>.· | 115 | The·integration·settings·allow·to·specify·command·line·parameters·that·should·be·ignored·by·<span·class="application">KDiff3</span>.· |
| 116 | They·will·appear·in·the·usage·help·like·in·this·example:</p><pre·class="screen"> | 116 | They·will·appear·in·the·usage·help·like·in·this·example:</p><pre·class="screen"> |
| 117 | ··--<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>foo</code></em></span>·····················Ignored.·(User·defined.) | 117 | ··--<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>foo</code></em></span>·····················Ignored.·(User·defined.) |
| 118 | </pre><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Command·line·options·to·ignore:</em></span></span></dt><dd><p> | 118 | </pre><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Command·line·options·to·ignore:</em></span></span></dt><dd><p> |
| 119 | ·····A·list·of·options,·separated·via·semicolon·';'.·When·one·of·these·options·appears·on·the·commandline,· | 119 | ·····A·list·of·options,·separated·via·semicolon·';'.·When·one·of·these·options·appears·on·the·commandline,· |
| 120 | ·····then·<span·class="application">KDiff3</span>·will·ignore·it·and·run·without·reporting·an·error.· | 120 | ·····then·<span·class="application">KDiff3</span>·will·ignore·it·and·run·without·reporting·an·error.· |
| Offset 153, 45 lines modified | Offset 153, 45 lines modified |
| 153 | ···you·can·simply·copy,·paste·and·compare·the·relevant·sections. | 153 | ···you·can·simply·copy,·paste·and·compare·the·relevant·sections. |
| 154 | </p><p> | 154 | </p><p> |
| 155 | ···Note:·Currently·you·cannot·drag·anything·from·<span·class="application">KDiff3</span>.·Only·dropping·in·the·diff·input | 155 | ···Note:·Currently·you·cannot·drag·anything·from·<span·class="application">KDiff3</span>.·Only·dropping·in·the·diff·input |
| 156 | ···is·supported. | 156 | ···is·supported. |
| 157 | </p><p> | 157 | </p><p> |
| 158 | ···Warning:·Some·editors·still·interpret·the·drag·and·drop·into·another·program·like·cut | 158 | ···Warning:·Some·editors·still·interpret·the·drag·and·drop·into·another·program·like·cut |
| 159 | ···(instead·of·copy)·and·paste.·Your·original·data·might·be·lost·then. | 159 | ···(instead·of·copy)·and·paste.·Your·original·data·might·be·lost·then. |
| 160 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="opendialog.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="interpretinginformation.html">Next</a></td></tr><tr><td·class="prevCell">Open-Dialog </td><td·class="upCell">File·Comparison·And·Merge</td><td·class="nextCell"> Comparing·Files·And·Interpreting·The·Information·In·The·Input·Windows</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></FILENAME><FILENAME·filename="interpretinginformation.html"><html><head><title>Comparing·Files·And·Interpreting·The·Information·In·The·Input·Windows</title><link·rel="stylesheet"·type="text/css"·href="help:/common/kde-default.css"><link·rel="stylesheet"·type="text/c·✂ | 160 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="opendialog.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="interpretinginformation.html">Next</a></td></tr><tr><td·class="prevCell">Open-Dialog </td><td·class="upCell">File·Comparison·And·Merge</td><td·class="nextCell"> Comparing·Files·And·Interpreting·The·Information·In·The·Input·Windows</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></FILENAME><FILENAME·filename="interpretinginformation.html"><html><head><title>Comparing·Files·And·Interpreting·The·Information·In·The·Input·Windows</title><link·rel="stylesheet"·type="text/css"·href="help:/common/kde-default.css"><link·rel="stylesheet"·type="text/c·✂ |
| 161 | ···At·the·top·of·each·text·window·is·its·"info·line".·The·info·lines·of | 161 | ···At·the·top·of·each·text·window·is·its·"info·line".·The·info·lines·of |
| 162 | ···the·input·windows·contain·a·letter·"A",·"B"·or·"C",·the·editable·filename, | 162 | ···the·input·windows·contain·a·letter·"A",·"B"·or·"C",·the·editable·filename, |
| 163 | ···a·button·for·browsing,·and·the·line·number·of·the·first·visible·line·in·the·window.· | 163 | ···a·button·for·browsing,·and·the·line·number·of·the·first·visible·line·in·the·window.· |
| 164 | ···(Note·that·window·"C"·is··optional.)·Each·info·line·appears·in·a·different·color. | 164 | ···(Note·that·window·"C"·is··optional.)·Each·info·line·appears·in·a·different·color. |
| 165 | </p><p> | 165 | </p><p> |
| 166 | ···When·you·selected·another·file·via·browsing·or·finished·editing·the·filename·here· | 166 | ···When·you·selected·another·file·via·browsing·or·finished·editing·the·filename·here· |
| 167 | ···by·pressing·enter,·the·new·file·will·be·loaded·and· | 167 | ···by·pressing·enter,·the·new·file·will·be·loaded·and· |
| 168 | ···compared·with·the·already·loaded·file(s). | 168 | ···compared·with·the·already·loaded·file(s). |
| 169 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148773176"></a>Coloring</h3></div></div></div><p> | 169 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148797752"></a>Coloring</h3></div></div></div><p> |
| 170 | ···The·three·input·windows·are·assigned·the·letters·"A",·"B"·and·"C". | 170 | ···The·three·input·windows·are·assigned·the·letters·"A",·"B"·and·"C". |
| 171 | ···"A"···has··color·blue,·"B"·has·green·and·"C"·has·magenta.·(These·are·the | 171 | ···"A"···has··color·blue,·"B"·has·green·and·"C"·has·magenta.·(These·are·the |
| 172 | ···defaults,···but··can·be·changed·in·the·Settings-Menu.) | 172 | ···defaults,···but··can·be·changed·in·the·Settings-Menu.) |
| 173 | </p><p> | 173 | </p><p> |
| 174 | ···When·a·difference·is·detected·then·the·color·shows·which·input·file | 174 | ···When·a·difference·is·detected·then·the·color·shows·which·input·file |
| 175 | ···differs.···When·both·other·input·files·differ·then·the·color·used·to·express | 175 | ···differs.···When·both·other·input·files·differ·then·the·color·used·to·express |
| 176 | ···this·is···red·by·default·("Conflict·color"·in·the·Settings). | 176 | ···this·is···red·by·default·("Conflict·color"·in·the·Settings). |
| 177 | ···This·colorscheme·is·especially·useful·in·the·case·of·three·input·files,·which·will·be | 177 | ···This·colorscheme·is·especially·useful·in·the·case·of·three·input·files,·which·will·be |
| 178 | ···seen·in·the·next·section·(<a·class="link"·href="merging.html"·title="Merging·And·The·Merge·Output·Editor·Window">Merging</a>). | 178 | ···seen·in·the·next·section·(<a·class="link"·href="merging.html"·title="Merging·And·The·Merge·Output·Editor·Window">Merging</a>). |
| 179 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148790968"></a>Summary·Column</h3></div></div></div><p> | 179 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148815544"></a>Summary·Column</h3></div></div></div><p> |
| 180 | ···Left·of·each·text·is·the·"summary·column".·If·differences·occurred·on·a | 180 | ···Left·of·each·text·is·the·"summary·column".·If·differences·occurred·on·a |
| 181 | ···line·then·the·summary·column·shows·the·respective·color.·For·a·white-space-only | 181 | ···line·then·the·summary·column·shows·the·respective·color.·For·a·white-space-only |
| 182 | ···difference·the·summary·is·chequered.·For·programming·languages·where·white | 182 | ···difference·the·summary·is·chequered.·For·programming·languages·where·white |
| 183 | ···space·is·not·so·important·this·is·useful·to·see·at·one·glance·if·anything | 183 | ···space·is·not·so·important·this·is·useful·to·see·at·one·glance·if·anything |
| 184 | ···of·importance·was·modified.·(In·C/C++·white·space·is·only·interesting·within | 184 | ···of·importance·was·modified.·(In·C/C++·white·space·is·only·interesting·within |
| 185 | ···strings,·comments,·for·the·preprocessor,·and·some·only·very·esoteric·situations.) | 185 | ···strings,·comments,·for·the·preprocessor,·and·some·only·very·esoteric·situations.) |
| 186 | </p><p> | 186 | </p><p> |
| 187 | ···The·vertical·line·separating·the·summary·column·and·the·text·is·interrupted | 187 | ···The·vertical·line·separating·the·summary·column·and·the·text·is·interrupted |
| 188 | ···if·the·input·file·had·no·lines·there.·When·word-wrap·is·enabled·then·this·vertical· | 188 | ···if·the·input·file·had·no·lines·there.·When·word-wrap·is·enabled·then·this·vertical· |
| 189 | ···line·appears·dotted·for·wrapped·lines. | 189 | ···line·appears·dotted·for·wrapped·lines. |
| 190 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148791864"></a>Overview·Column</h3></div></div></div><p> | 190 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148816440"></a>Overview·Column</h3></div></div></div><p> |
| 191 | ···On·the·right·side·a·"overview"-column·is·visible·left·of·the·vertical·scrollbar. | 191 | ···On·the·right·side·a·"overview"-column·is·visible·left·of·the·vertical·scrollbar. |
| 192 | ···It·shows·the·compressed·summary·column·of·input·"A".·All·the·differences | 192 | ···It·shows·the·compressed·summary·column·of·input·"A".·All·the·differences |
| 193 | ···and·conflicts·are·visible·at·one·glance.·When·only·two·input·windows·are | 193 | ···and·conflicts·are·visible·at·one·glance.·When·only·two·input·windows·are |
| 194 | ···used,·then·all·differences·appear·red·here·because·every·difference·is | 194 | ···used,·then·all·differences·appear·red·here·because·every·difference·is |
| 195 | ···also···a·conflict.·A·black·rectangle·frames·the·visible·part·of·the·inputs. | 195 | ···also···a·conflict.·A·black·rectangle·frames·the·visible·part·of·the·inputs. |
| 196 | ···For··very·long·input·files,·when·the·number·of·input·lines·is·bigger·than | 196 | ···For··very·long·input·files,·when·the·number·of·input·lines·is·bigger·than |
| 197 | ···the·height·of·the·overview·column·in·pixels,·then·several·input·lines·share | 197 | ···the·height·of·the·overview·column·in·pixels,·then·several·input·lines·share |
| Offset 237, 15 lines modified | Offset 237, 15 lines modified |
| 237 | </p><p> | 237 | </p><p> |
| 238 | ···With·three·input·files·the·first·file·is·treated·as·base,·while·the | 238 | ···With·three·input·files·the·first·file·is·treated·as·base,·while·the |
| 239 | ···second···and·third·input·files·contain·modifications.·When·at·any·line·only | 239 | ···second···and·third·input·files·contain·modifications.·When·at·any·line·only |
| 240 | ···either···input·B·or·input·C·have·changed·but·not·both·then·the·changed·source | 240 | ···either···input·B·or·input·C·have·changed·but·not·both·then·the·changed·source |
| 241 | ···will···automatically·be·selected.·Only·when·B·and·C·have·changed·on·the·same | 241 | ···will···automatically·be·selected.·Only·when·B·and·C·have·changed·on·the·same |
| 242 | ···lines,···then·the·tool·detects·a·conflict·that·must·be·solved·manually. | 242 | ···lines,···then·the·tool·detects·a·conflict·that·must·be·solved·manually. |
| 243 | ···When·B·and·C·are·the·same,·but·not·the·same·as·A,·then·C·is·selected. | 243 | ···When·B·and·C·are·the·same,·but·not·the·same·as·A,·then·C·is·selected. |
| 244 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148803256"></a>The·Summary·Column</h3></div></div></div><p> | 244 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148827832"></a>The·Summary·Column</h3></div></div></div><p> |
| 245 | ···The·merge·output·editor·window·also·has·a·summary·column·on·the·left.·It·shows·the | 245 | ···The·merge·output·editor·window·also·has·a·summary·column·on·the·left.·It·shows·the |
| 246 | ···letter·of·the·input·from·which·a·line·was·selected·or·nothing·if·all·three | 246 | ···letter·of·the·input·from·which·a·line·was·selected·or·nothing·if·all·three |
| 247 | ···sources·where·equal·on·a·line.·For·conflicts·it·shows·a·questionmark·"?" | 247 | ···sources·where·equal·on·a·line.·For·conflicts·it·shows·a·questionmark·"?" |
| 248 | ···and·the·line·shows·"<Merge·Conflict>",·all·in·red.·Because·solving | 248 | ···and·the·line·shows·"<Merge·Conflict>",·all·in·red.·Because·solving |
| 249 | ···conflicts··line·by·line·would·take·very·long,·the·lines·are·grouped·into | 249 | ···conflicts··line·by·line·would·take·very·long,·the·lines·are·grouped·into |
| 250 | ···groups·that··have·the·same·difference·and·conflict·characteristics. | 250 | ···groups·that··have·the·same·difference·and·conflict·characteristics. |
| 251 | ···But·only-white-space-conflicts·are·separated·from·non-white-space-conflicts | 251 | ···But·only-white-space-conflicts·are·separated·from·non-white-space-conflicts |
| Offset 253, 15 lines modified | Offset 253, 15 lines modified |
| 253 | ···lines. | 253 | ···lines. |
| 254 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="synchronise_views"></a>Setting·The·Current·Group·And·Synchronising·Merge·And·Diff·View·Position</h3></div></div></div><p> | 254 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="synchronise_views"></a>Setting·The·Current·Group·And·Synchronising·Merge·And·Diff·View·Position</h3></div></div></div><p> |
| 255 | ···When·clicking·into··the·summary·column·with·the·left·mouse·button·in·either | 255 | ···When·clicking·into··the·summary·column·with·the·left·mouse·button·in·either |
| 256 | ···window·then·the·beginning·of·the·group·belonging·to·that·line·will·shown·in·all·windows. | 256 | ···window·then·the·beginning·of·the·group·belonging·to·that·line·will·shown·in·all·windows. |
| 257 | ···This·group·then·becomes·the·"current·group".·It·is·highlighted·with·the | 257 | ···This·group·then·becomes·the·"current·group".·It·is·highlighted·with·the |
| 258 | ···"Current·range·(diff)·background·color"·and | 258 | ···"Current·range·(diff)·background·color"·and |
| 259 | ···a·black·bar·appears·on·the·left·side·of·the·text. | 259 | ···a·black·bar·appears·on·the·left·side·of·the·text. |
| 260 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148804664"></a>Choosing·Inputs·A,·B·or·C·For·Current·Conflict·And·Editing</h3></div></div></div><p> | 260 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148829240"></a>Choosing·Inputs·A,·B·or·C·For·Current·Conflict·And·Editing</h3></div></div></div><p> |
| 261 | ···The·button·bar·below·the·menubar·contains·three·input·selector·buttons· | 261 | ···The·button·bar·below·the·menubar·contains·three·input·selector·buttons· |
| 262 | ···containing·the·letters·"A",·"B"·and·"C".·Click·the·input·selector· | 262 | ···containing·the·letters·"A",·"B"·and·"C".·Click·the·input·selector· |
| 263 | ···button·to·insert·(or·remove·if·already·inserted)·the·lines·from·the·respective·source. | 263 | ···button·to·insert·(or·remove·if·already·inserted)·the·lines·from·the·respective·source. |
| 264 | ···To·choose·the·lines·from·several·inputs·click·the·respective·buttons·in·the | 264 | ···To·choose·the·lines·from·several·inputs·click·the·respective·buttons·in·the |
| 265 | ···needed·order.·For·example·if·you·want·that·the·lines·from·"B"·appear·before· | 265 | ···needed·order.·For·example·if·you·want·that·the·lines·from·"B"·appear·before· |
| 266 | ···the·lines·from·"A"·in·the·output,·first·click·"B",·then·"A". | 266 | ···the·lines·from·"A"·in·the·output,·first·click·"B",·then·"A". |
| 267 | </p><p> | 267 | </p><p> |
| Offset 282, 15 lines modified | Offset 282, 15 lines modified |
| 282 | ···will·appear·in·that·line.·This·is·just·a·placeholder·for·the·group·for | 282 | ···will·appear·in·that·line.·This·is·just·a·placeholder·for·the·group·for |
| 283 | ···when··you·might·change·your·mind·and·select·some·source·again.·This·text·won't | 283 | ···when··you·might·change·your·mind·and·select·some·source·again.·This·text·won't |
| 284 | ···appear·in·the·saved·file·or·in·any·selections·you·want·to·copy·and·paste. | 284 | ···appear·in·the·saved·file·or·in·any·selections·you·want·to·copy·and·paste. |
| 285 | </p><p> | 285 | </p><p> |
| 286 | ···The·text·"<Merge·Conflict>"·will·appear·in·the·clipboard·if·you | 286 | ···The·text·"<Merge·Conflict>"·will·appear·in·the·clipboard·if·you |
| 287 | ···copy·and···paste·some·text·containing·such·a·line.·But·still·be·careful·to | 287 | ···copy·and···paste·some·text·containing·such·a·line.·But·still·be·careful·to |
| 288 | ···do·so. | 288 | ···do·so. |
| 289 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148820024"></a>Choosing·Input·A,·B,·or·C·for·All·Conflicts</h3></div></div></div><p> | 289 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148844600"></a>Choosing·Input·A,·B,·or·C·for·All·Conflicts</h3></div></div></div><p> |
| 290 | ···The·normal·merge·will·start·by·solving·simple·conflicts·automatically. | 290 | ···The·normal·merge·will·start·by·solving·simple·conflicts·automatically. |
| 291 | ···But·the·"Merge"-menu·provides·some·actions·for·other·common·needs. | 291 | ···But·the·"Merge"-menu·provides·some·actions·for·other·common·needs. |
| 292 | ···If·you·have·to·select·the·same·source·for·most·conflicts,·then·you·can | 292 | ···If·you·have·to·select·the·same·source·for·most·conflicts,·then·you·can |
| 293 | ···choose·"A",·"B"·or·"C"·everywhere,·or·only·for·the·remaining·unsolved | 293 | ···choose·"A",·"B"·or·"C"·everywhere,·or·only·for·the·remaining·unsolved |
| 294 | ···conflicts,·or·for·unsolved·white·space·conflicts.·If·you·want·to·decide·every | 294 | ···conflicts,·or·for·unsolved·white·space·conflicts.·If·you·want·to·decide·every |
| 295 | ···single·delta·yourself,·you·can·"Set·deltas·to·conflicts".·Or·if·you·want·to | 295 | ···single·delta·yourself,·you·can·"Set·deltas·to·conflicts".·Or·if·you·want·to |
| 296 | ···return·to·the·automatic·choices·of·<span·class="application">KDiff3</span>·then·select | 296 | ···return·to·the·automatic·choices·of·<span·class="application">KDiff3</span>·then·select |
| Offset 523, 25 lines modified | Offset 523, 25 lines modified |
| 523 | ·······</p></dd></dl></div><p> | 523 | ·······</p></dd></dl></div><p> |
| 524 | ···Other·important·options·for·printing·will·be·taken·from·the·normal·options: | 524 | ···Other·important·options·for·printing·will·be·taken·from·the·normal·options: |
| 525 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Font,·font·size</p></li><li·class="listitem"><p>Show·line·numbers</p></li><li·class="listitem"><p>Word·wrap</p></li><li·class="listitem"><p>Colors</p></li><li·class="listitem"><p>etc.</p></li></ul></div><p> | 525 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Font,·font·size</p></li><li·class="listitem"><p>Show·line·numbers</p></li><li·class="listitem"><p>Word·wrap</p></li><li·class="listitem"><p>Colors</p></li><li·class="listitem"><p>etc.</p></li></ul></div><p> |
| 526 | ···Landscape·formatting·is·also·recommended·for·printing. | 526 | ···Landscape·formatting·is·also·recommended·for·printing. |
| 527 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="find.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="options.html">Next</a></td></tr><tr><td·class="prevCell">Finding·Strings </td><td·class="upCell">File·Comparison·And·Merge</td><td·class="nextCell"> Options</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></FILENAME><FILENAME·filename="options.html"><html><head><title>Options</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··✂ | 527 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="find.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="options.html">Next</a></td></tr><tr><td·class="prevCell">Finding·Strings </td><td·class="upCell">File·Comparison·And·Merge</td><td·class="nextCell"> Options</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></FILENAME><FILENAME·filename="options.html"><html><head><title>Options</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··✂ |
| 528 | ···Options·and·the·recent-file-list·will·be·saved·when·you·exit·the·program, | 528 | ···Options·and·the·recent-file-list·will·be·saved·when·you·exit·the·program, |
| 529 | ···and·reloaded·when·you·start·it.·(Menu·Settings->Configure·<span·class="application">KDiff3</span>·...) | 529 | ···and·reloaded·when·you·start·it.·(Menu·Settings->Configure·<span·class="application">KDiff3</span>·...) |
| 530 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148866104"></a>Font</h3></div></div></div><p> | 530 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148890680"></a>Font</h3></div></div></div><p> |
| 531 | ···Select·a·fixed·width·font.·(On·some·systems·this·dialog·will·also | 531 | ···Select·a·fixed·width·font.·(On·some·systems·this·dialog·will·also |
| 532 | ···present····variable·width·fonts,·but·you·should·not·use·them.) | 532 | ···present····variable·width·fonts,·but·you·should·not·use·them.) |
| 533 | </p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Italic·Font·for·Deltas:</em></span></span></dt><dd><p>·If·you·select·this,·then·text·differences | 533 | </p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Italic·Font·for·Deltas:</em></span></span></dt><dd><p>·If·you·select·this,·then·text·differences |
| 534 | ·······will·be·drawn·with·the·italic·version·of·the·selected·font.·If·the·font | 534 | ·······will·be·drawn·with·the·italic·version·of·the·selected·font.·If·the·font |
| 535 | ·······doesn't··support·italic,·then·this·does·nothing.</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148868664"></a>Colors</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Foreground·color:</em></span></span></dt><dd><p>·Usually·black.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Background·color:</em></span></span></dt><dd><p>·Usually·white.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Diff·Background·color:</em></span></span></dt><dd><p>·Usually·light·gray.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·A:</em></span></span></dt><dd><p>·Usually·dark·blue.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·B:</em></span></span></dt><dd><p>·Usually·dark·green.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·C:</em></span></span></dt><dd><p>·Usually·dark·magenta.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>·✂ | 535 | ·······doesn't··support·italic,·then·this·does·nothing.</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148893240"></a>Colors</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Foreground·color:</em></span></span></dt><dd><p>·Usually·black.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Background·color:</em></span></span></dt><dd><p>·Usually·white.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Diff·Background·color:</em></span></span></dt><dd><p>·Usually·light·gray.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·A:</em></span></span></dt><dd><p>·Usually·dark·blue.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·B:</em></span></span></dt><dd><p>·Usually·dark·green.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>Color·C:</em></span></span></dt><dd><p>·Usually·dark·magenta.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>·✂ |
| 536 | ···Changing·the·colors·for·directory·comparison·will·be·effective·only·when·starting·the·next·directory·comparison. | 536 | ···Changing·the·colors·for·directory·comparison·will·be·effective·only·when·starting·the·next·directory·comparison. |
| 537 | </p><p> | 537 | </p><p> |
| 538 | ···On·systems·with·only·16·or·256·colors·some·colors·are·not·available·in·pure | 538 | ···On·systems·with·only·16·or·256·colors·some·colors·are·not·available·in·pure |
| 539 | ···form.·On·such·systems·the·"Defaults"-button·will·choose·a·pure·color. | 539 | ···form.·On·such·systems·the·"Defaults"-button·will·choose·a·pure·color. |
| 540 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148884920"></a>Editor·Settings</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Tab·inserts·spaces:</em></span></span></dt><dd><p>·If·this·is·disabled·and·you·press·the | 540 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148909496"></a>Editor·Settings</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Tab·inserts·spaces:</em></span></span></dt><dd><p>·If·this·is·disabled·and·you·press·the |
| 541 | ······tabulator·key,···a·tab-character·is·inserted,·otherwise·the·appropriate | 541 | ······tabulator·key,···a·tab-character·is·inserted,·otherwise·the·appropriate |
| 542 | ······amount··of·characters···is·inserted.</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Tab·size:</em></span></span></dt><dd><p>·Can·be·adjusted·for·your·specific·needs.·Default·is·8.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Auto·indentation:</em></span></span></dt><dd><p>·When·pressing·Enter·or·Return·the·indentation | 542 | ······amount··of·characters···is·inserted.</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Tab·size:</em></span></span></dt><dd><p>·Can·be·adjusted·for·your·specific·needs.·Default·is·8.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Auto·indentation:</em></span></span></dt><dd><p>·When·pressing·Enter·or·Return·the·indentation |
| 543 | ······of·the·previous··line·is·used·for·the·new·line.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Auto·copy·selection:</em></span></span></dt><dd><p>·Every·selection·is·immediately·copied | 543 | ······of·the·previous··line·is·used·for·the·new·line.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Auto·copy·selection:</em></span></span></dt><dd><p>·Every·selection·is·immediately·copied |
| 544 | ······to·the·clipboard···when·active·and·you·needn't·explicitely·copy·it.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Line·end·style:</em></span></span></dt><dd><p>·When·saving·you·can·select·what·line· | 544 | ······to·the·clipboard···when·active·and·you·needn't·explicitely·copy·it.·</p></dd><dt><span·class="term"><span·class="emphasis"><em>···Line·end·style:</em></span></span></dt><dd><p>·When·saving·you·can·select·what·line· |
| 545 | ······end·style·you·prefer.·The·default·setting·is·the·common·choice·for·the·used·operating·system.·</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="diffoptions"></a>Diff·Settings</h3></div></div></div><p> | 545 | ······end·style·you·prefer.·The·default·setting·is·the·common·choice·for·the·used·operating·system.·</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="diffoptions"></a>Diff·Settings</h3></div></div></div><p> |
| 546 | ···When·comparing·files,·<span·class="application">KDiff3</span>·first·it·tries·to·match·lines·that·are·equal | 546 | ···When·comparing·files,·<span·class="application">KDiff3</span>·first·it·tries·to·match·lines·that·are·equal |
| 547 | ···in·all·input·files.·Only·during·this·step·it·might·ignore·white·space.·The | 547 | ···in·all·input·files.·Only·during·this·step·it·might·ignore·white·space.·The |
| Offset 606, 32 lines modified | Offset 606, 32 lines modified |
| 606 | ···</p></dd><dt><span·class="term"><span·class="emphasis"><em>Irrelevant·merge·command:</em></span></span></dt><dd><p> | 606 | ···</p></dd><dt><span·class="term"><span·class="emphasis"><em>Irrelevant·merge·command:</em></span></span></dt><dd><p> |
| 607 | ······Specify·a·command·of·your·own·that·should·be·called·when·<span·class="application">KDiff3</span>·detects· | 607 | ······Specify·a·command·of·your·own·that·should·be·called·when·<span·class="application">KDiff3</span>·detects· |
| 608 | ······that·for·a·three·file·merge·the·file·from·B·doesn't·contribute·any· | 608 | ······that·for·a·three·file·merge·the·file·from·B·doesn't·contribute·any· |
| 609 | ······relevant·data·that·isn't·already·contained·in·the·file·from·C. | 609 | ······relevant·data·that·isn't·already·contained·in·the·file·from·C. |
| 610 | ······The·command·is·called·with·the·three·filenames·as·parameters. | 610 | ······The·command·is·called·with·the·three·filenames·as·parameters. |
| 611 | ······Data·matched·by·the·"Auto·merge·regular·expression"·or·in·the· | 611 | ······Data·matched·by·the·"Auto·merge·regular·expression"·or·in·the· |
| 612 | ······history·isn't·considered·relevant. | 612 | ······history·isn't·considered·relevant. |
| 613 | ···</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148918072"></a>Directory·Merge</h3></div></div></div><p> | 613 | ···</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148942648"></a>Directory·Merge</h3></div></div></div><p> |
| 614 | ···These·options·are·concerned·with·scanning·the·directory·and·handling·the | 614 | ···These·options·are·concerned·with·scanning·the·directory·and·handling·the |
| 615 | ···merge:·See·the·<a·class="link"·href="dirmergeoptions.html"·title="Options·for·Comparing·and·Merging·Directories">Directory·Comparison/Merge | 615 | ···merge:·See·the·<a·class="link"·href="dirmergeoptions.html"·title="Options·for·Comparing·and·Merging·Directories">Directory·Comparison/Merge |
| 616 | ···Docs</a>·for·details. | 616 | ···Docs</a>·for·details. |
| 617 | </p><p> | 617 | </p><p> |
| 618 | Yet·there·is·one·option·here·that·is·also·relevant·for·saving·single·files: | 618 | Yet·there·is·one·option·here·that·is·also·relevant·for·saving·single·files: |
| 619 | </p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Backup·files:</em></span></span></dt><dd><p>·When·a·file·is·saved·and·an·older·version·already | 619 | </p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Backup·files:</em></span></span></dt><dd><p>·When·a·file·is·saved·and·an·older·version·already |
| 620 | ······exists,·then·the·original·version·will·be·renamed·with·an·".orig"·extension. | 620 | ······exists,·then·the·original·version·will·be·renamed·with·an·".orig"·extension. |
| 621 | ······If·an·old·backup·file·with·".orig"·extension·already·exists·then·this·will | 621 | ······If·an·old·backup·file·with·".orig"·extension·already·exists·then·this·will |
| 622 | ······be·deleted·without·backup. | 622 | ······be·deleted·without·backup. |
| 623 | ···</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148921272"></a>Regional·and·Language·Options</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Language:</em></span></span></dt><dd><p>Adjust·the·language·of·the·user·interface.·Changing·this·option·doesn't·affect·the·running·program.·You·have·to·exit·and·restart·<span·class="application">KDiff3</span>·so·that·the·language·is·changed.·(This·option·is·not·available·in·the·KDE·version·of·<span·class="application">KDiff3</span>·because·the·language·is·adjustable·in·the·global·KDE·settings.)· | 623 | ···</p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148945848"></a>Regional·and·Language·Options</h3></div></div></div><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Language:</em></span></span></dt><dd><p>Adjust·the·language·of·the·user·interface.·Changing·this·option·doesn't·affect·the·running·program.·You·have·to·exit·and·restart·<span·class="application">KDiff3</span>·so·that·the·language·is·changed.·(This·option·is·not·available·in·the·KDE·version·of·<span·class="application">KDiff3</span>·because·the·language·is·adjustable·in·the·global·KDE·settings.)· |
| 624 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Use·the·same·encoding·for·everything:</em></span></span></dt><dd><p>·The·following·encoding·options·can·be·adjusted·separately·for·each·item·or·if·this·option·is·true,·all·values·will·take·the·first·value. | 624 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Use·the·same·encoding·for·everything:</em></span></span></dt><dd><p>·The·following·encoding·options·can·be·adjusted·separately·for·each·item·or·if·this·option·is·true,·all·values·will·take·the·first·value. |
| 625 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Local·Encoding:</em></span></span></dt><dd><p>Above·the·codec-selectors·appears·a·note·that·tells·you·what·the·local·encoding·is.·(This·is·not·adjustable·but·for·your·information·just·in·case·you·don't·know·your·local·encoding,·but·need·to·select·it.) | 625 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Local·Encoding:</em></span></span></dt><dd><p>Above·the·codec-selectors·appears·a·note·that·tells·you·what·the·local·encoding·is.·(This·is·not·adjustable·but·for·your·information·just·in·case·you·don't·know·your·local·encoding,·but·need·to·select·it.) |
| 626 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·A/B/C:</em></span></span></dt><dd><p>·Adjust·the·file·encoding·for·input·files.·This·has·an·effect·on·how·the·special·characters·are·interpreted.·Since·you·can·adjust·each·codec·separately·you·can·even·compare·and·merge·files·that·were·saved·using·different·codecs. | 626 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·A/B/C:</em></span></span></dt><dd><p>·Adjust·the·file·encoding·for·input·files.·This·has·an·effect·on·how·the·special·characters·are·interpreted.·Since·you·can·adjust·each·codec·separately·you·can·even·compare·and·merge·files·that·were·saved·using·different·codecs. |
| 627 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·Merge·Output·and·Saving:</em></span></span></dt><dd><p>·When·you·have·edited·a·file,·then·you·can·adjust·which·encoding·will·be·used·when·saving·to·disk. | 627 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·Merge·Output·and·Saving:</em></span></span></dt><dd><p>·When·you·have·edited·a·file,·then·you·can·adjust·which·encoding·will·be·used·when·saving·to·disk. |
| 628 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·Preprocessor·Files:</em></span></span></dt><dd><p>When·you·define·preprocessors·then·they·might·not·be·able·to·operate·on·your·codec.·(e.g.:·Your·files·are·16-bit-unicode·and·your·preprocessor·can·only·take·8-bit-ascii.)·With·this·option·you·can·define·the·encoding·of·preprocessor·output. | 628 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>File·Encoding·for·Preprocessor·Files:</em></span></span></dt><dd><p>When·you·define·preprocessors·then·they·might·not·be·able·to·operate·on·your·codec.·(e.g.:·Your·files·are·16-bit-unicode·and·your·preprocessor·can·only·take·8-bit-ascii.)·With·this·option·you·can·define·the·encoding·of·preprocessor·output. |
| 629 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Right·To·Left·Language:</em></span></span></dt><dd><p>Some·languages·are·written·right·to·left.·When·this·option·is·enabled,·<span·class="application">KDiff3</span>·draws·the·text·from·right·to·left·in·the·diff·input·windows·and·in·the·merge·output·window.·Note·that·if·you·start·<span·class="application">KDiff3</span>·with·the·command·line·option·"--reverse"·then·all·layouting·will·be·done·right·to·left·too.·(This·is·a·feature·provided·by·Qt.)·This·documentation·was·written·assuming·that·"Right·To·Left·Language"·or·reverse·layout·are·disabled.·So·some·references·to·"left"·or·"right"·must·be·replaced·by·their·respective·counterpart·if·you·use·these·options. | 629 | » </p></dd><dt><span·class="term"><span·class="emphasis"><em>Right·To·Left·Language:</em></span></span></dt><dd><p>Some·languages·are·written·right·to·left.·When·this·option·is·enabled,·<span·class="application">KDiff3</span>·draws·the·text·from·right·to·left·in·the·diff·input·windows·and·in·the·merge·output·window.·Note·that·if·you·start·<span·class="application">KDiff3</span>·with·the·command·line·option·"--reverse"·then·all·layouting·will·be·done·right·to·left·too.·(This·is·a·feature·provided·by·Qt.)·This·documentation·was·written·assuming·that·"Right·To·Left·Language"·or·reverse·layout·are·disabled.·So·some·references·to·"left"·or·"right"·must·be·replaced·by·their·respective·counterpart·if·you·use·these·options. |
| 630 | » </p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148931128"></a>Miscellaneous</h3></div></div></div><p>(These·options·and·actions·are·available·in·menus·or·the·buttonbar.)</p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Show·line·numbers:</em></span></span></dt><dd><p>·You·can·select·if·line·numbers·should·be | 630 | » </p></dd></dl></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp148955704"></a>Miscellaneous</h3></div></div></div><p>(These·options·and·actions·are·available·in·menus·or·the·buttonbar.)</p><div·class="variablelist"><dl><dt><span·class="term"><span·class="emphasis"><em>Show·line·numbers:</em></span></span></dt><dd><p>·You·can·select·if·line·numbers·should·be |
| 631 | ·····shown·for·the·input·files.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Show·space·and·tabulator·characters·for·differences:</em></span></span></dt><dd><p>·Sometimes | 631 | ·····shown·for·the·input·files.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Show·space·and·tabulator·characters·for·differences:</em></span></span></dt><dd><p>·Sometimes |
| 632 | ·····the·visible·spaces·and·tabs·are·disturbing.·You·can·turn·this·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Show·white·space:</em></span></span></dt><dd><p>·Turn·this·off·to·suppress | 632 | ·····the·visible·spaces·and·tabs·are·disturbing.·You·can·turn·this·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Show·white·space:</em></span></span></dt><dd><p>·Turn·this·off·to·suppress |
| 633 | ······any·highlighting·of·white-space-only·changes·in·the·text·or·overview-columns. | 633 | ······any·highlighting·of·white-space-only·changes·in·the·text·or·overview-columns. |
| 634 | ······(Note·that·this·also·applies·to·changes·in·numbers·or·comments·if·the·options·"Ignore·numbers" | 634 | ······(Note·that·this·also·applies·to·changes·in·numbers·or·comments·if·the·options·"Ignore·numbers" |
| 635 | ······or·"Ignore·C/C++·comments"·are·active.)</p></dd><dt><span·class="term"><span·class="emphasis"><em>Overview·options:</em></span></span></dt><dd><p> | 635 | ······or·"Ignore·C/C++·comments"·are·active.)</p></dd><dt><span·class="term"><span·class="emphasis"><em>Overview·options:</em></span></span></dt><dd><p> |
| 636 | ·····These·choices·are·only·available·when·you·compare·three·files.·In·normal·mode·all | 636 | ·····These·choices·are·only·available·when·you·compare·three·files.·In·normal·mode·all |
| 637 | ·····differences·are·shown·in·one·color-coded·overview-column.·But·sometimes·you·are·· | 637 | ·····differences·are·shown·in·one·color-coded·overview-column.·But·sometimes·you·are·· |
| Offset 749, 15 lines modified | Offset 749, 15 lines modified |
| 749 | The·"|"-symbol·is·the·pipe-command·that·transfers·the·output·of·the·previous· | 749 | The·"|"-symbol·is·the·pipe-command·that·transfers·the·output·of·the·previous· |
| 750 | command·to·the·input·of·the·following·command.·If·you·want·to·test·with·a·longer·file | 750 | command·to·the·input·of·the·following·command.·If·you·want·to·test·with·a·longer·file |
| 751 | then·you·can·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>cat</strong></span></span>·on·Unix-like·systems·or·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>type</strong></span></span>· | 751 | then·you·can·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>cat</strong></span></span>·on·Unix-like·systems·or·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>type</strong></span></span>· |
| 752 | on·Windows-like·systems.·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·will·do·the·substitution·for·each·line. | 752 | on·Windows-like·systems.·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·will·do·the·substitution·for·each·line. |
| 753 | </p><pre·class="screen"> | 753 | </p><pre·class="screen"> |
| 754 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>cat</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>filename</code></em></span>·|·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>options</code></em></span> | 754 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>cat</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>filename</code></em></span>·|·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>options</code></em></span> |
| 755 | </pre><p> | 755 | </pre><p> |
| 756 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="sedforkdiff3"></a>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></h3></div></div></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148969272"></a>Ignoring·Other·Types·Of·Comments</h4></div></div></div><p> | 756 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="sedforkdiff3"></a>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></h3></div></div></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149002040"></a>Ignoring·Other·Types·Of·Comments</h4></div></div></div><p> |
| 757 | Currently·<span·class="application">KDiff3</span>·understands·only·C/C++·comments.·Using·the | 757 | Currently·<span·class="application">KDiff3</span>·understands·only·C/C++·comments.·Using·the |
| 758 | Line-Matching-Preprocessor-Command·you·can·also·ignore | 758 | Line-Matching-Preprocessor-Command·you·can·also·ignore |
| 759 | other·types·of·comments,·by·converting·them·into·C/C++-comments. | 759 | other·types·of·comments,·by·converting·them·into·C/C++-comments. |
| | |
| 760 | Example:·To·ignore·comments·starting·with·"#",·you·would·like·to·convert·them | 760 | Example:·To·ignore·comments·starting·with·"#",·you·would·like·to·convert·them |
| 761 | to·"//".·Note·that·you·also·must·enable·the·"Ignore·C/C++-Comments"·option·to·get· | 761 | to·"//".·Note·that·you·also·must·enable·the·"Ignore·C/C++-Comments"·option·to·get· |
| 762 | an·effect.·An·appropriate·Line-Matching-Preprocessor-Command·would·be: | 762 | an·effect.·An·appropriate·Line-Matching-Preprocessor-Command·would·be: |
| Offset 768, 84 lines modified | Offset 768, 84 lines modified |
| 768 | Since·for·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·the·"/"-character·has·a·special·meaning,·it·is·necessary·to·place·the· | 768 | Since·for·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·the·"/"-character·has·a·special·meaning,·it·is·necessary·to·place·the· |
| 769 | "\"-character·before·each·"/"·in·the·replacement-string.·Sometimes·the·"\"·is·required | 769 | "\"-character·before·each·"/"·in·the·replacement-string.·Sometimes·the·"\"·is·required |
| 770 | to·add·or·remove·a·special·meaning·of·certain·characters.·The·single·quotation·marks·(')·before· | 770 | to·add·or·remove·a·special·meaning·of·certain·characters.·The·single·quotation·marks·(')·before· |
| 771 | and·after·the·substitution-command·are·important·now,·because·otherwise·the·shell·will | 771 | and·after·the·substitution-command·are·important·now,·because·otherwise·the·shell·will |
| 772 | try·to·interpret·some·special·characters·like·'#',·'$'·or·'\'·before·passing·them·to· | 772 | try·to·interpret·some·special·characters·like·'#',·'$'·or·'\'·before·passing·them·to· |
| 773 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>.·<span·class="emphasis"><em>Note·that·on·Windows·you·will·need·the·double·quotation·marks·(")·here.·Windows | 773 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>.·<span·class="emphasis"><em>Note·that·on·Windows·you·will·need·the·double·quotation·marks·(")·here.·Windows |
| 774 | substitutes·other·characters·like·'%',·so·you·might·have·to·experiment·a·little·bit.</em></span> | 774 | substitutes·other·characters·like·'%',·so·you·might·have·to·experiment·a·little·bit.</em></span> |
| 775 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148972600"></a>Caseinsensitive·Diff</h4></div></div></div><p> | 775 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149005368"></a>Caseinsensitive·Diff</h4></div></div></div><p> |
| 776 | Use·the·following·Line-Matching-Preprocessor-Command·to·convert·all·input·to·uppercase: | 776 | Use·the·following·Line-Matching-Preprocessor-Command·to·convert·all·input·to·uppercase: |
| 777 | </p><pre·class="screen"> | 777 | </p><pre·class="screen"> |
| 778 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\(.*\)/\U\1/' | 778 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\(.*\)/\U\1/' |
| 779 | </pre><p> | 779 | </pre><p> |
| 780 | Here·the·".*"·is·a·regular·expression·that·matches·any·string·and·in·this·context·matches· | 780 | Here·the·".*"·is·a·regular·expression·that·matches·any·string·and·in·this·context·matches· |
| 781 | all·characters·in·the·line.· | 781 | all·characters·in·the·line.· |
| 782 | The·"\1"·in·the·replacement·string·refers·to·the·matched·text·within·the·first·pair·of·"\("·and·"\)". | 782 | The·"\1"·in·the·replacement·string·refers·to·the·matched·text·within·the·first·pair·of·"\("·and·"\)". |
| 783 | The·"\U"·converts·the·inserted·text·to·uppercase. | 783 | The·"\U"·converts·the·inserted·text·to·uppercase. |
| 784 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148974392"></a>Ignoring·Version·Control·Keywords</h4></div></div></div><p> | 784 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149007160"></a>Ignoring·Version·Control·Keywords</h4></div></div></div><p> |
| 785 | CVS·and·other·version·control·systems·use·several·keywords·to·insert·automatically | 785 | CVS·and·other·version·control·systems·use·several·keywords·to·insert·automatically |
| 786 | generated·strings·(<a·class="ulink"·href="info:/cvs/Keyword%20substitution"·target="_top">info:/cvs/Keyword·substitution</a>). | 786 | generated·strings·(<a·class="ulink"·href="info:/cvs/Keyword%20substitution"·target="_top">info:/cvs/Keyword·substitution</a>). |
| 787 | All·of·them·follow·the·pattern·"$KEYWORD·generated·text$".·We·now·need·a | 787 | All·of·them·follow·the·pattern·"$KEYWORD·generated·text$".·We·now·need·a |
| 788 | Line-Matching-Preprocessor-Command·that·removes·only·the·generated·text: | 788 | Line-Matching-Preprocessor-Command·that·removes·only·the·generated·text: |
| 789 | </p><pre·class="screen"> | 789 | </p><pre·class="screen"> |
| 790 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' | 790 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' |
| 791 | </pre><p> | 791 | </pre><p> |
| 792 | The·"\|"·separates·the·possible·keywords.·You·might·want·to·modify·this·list· | 792 | The·"\|"·separates·the·possible·keywords.·You·might·want·to·modify·this·list· |
| 793 | according·to·your·needs. | 793 | according·to·your·needs. |
| 794 | The·"\"·before·the·"$"·is·necessary·because·otherwise·the·"$"·matches·the·end·of·the·line. | 794 | The·"\"·before·the·"$"·is·necessary·because·otherwise·the·"$"·matches·the·end·of·the·line. |
| 795 | </p><p> | 795 | </p><p> |
| 796 | While·experimenting·with·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·you·might·come·to·understand·and·even·like | 796 | While·experimenting·with·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·you·might·come·to·understand·and·even·like |
| 797 | these·regular·expressions.·They·are·useful·because·there·are·many·other·programs·that·also· | 797 | these·regular·expressions.·They·are·useful·because·there·are·many·other·programs·that·also· |
| 798 | support·similar·things. | 798 | support·similar·things. |
| 799 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148977464"></a>Ignoring·Numbers</h4></div></div></div><p> | 799 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149010232"></a>Ignoring·Numbers</h4></div></div></div><p> |
| 800 | Ignoring·numbers·actually·is·a·built-in·option.·But·as·another·example,·this·is·how | 800 | Ignoring·numbers·actually·is·a·built-in·option.·But·as·another·example,·this·is·how |
| 801 | it·would·look·as·a·Line-Matching-Preprocessor-command. | 801 | it·would·look·as·a·Line-Matching-Preprocessor-command. |
| 802 | </p><pre·class="screen"> | 802 | </p><pre·class="screen"> |
| 803 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/[0123456789.-]//g' | 803 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/[0123456789.-]//g' |
| 804 | </pre><p> | 804 | </pre><p> |
| 805 | Any·character·within·'['·and·']'·is·a·match·and·will·be·replaced·with·nothing. | 805 | Any·character·within·'['·and·']'·is·a·match·and·will·be·replaced·with·nothing. |
| 806 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148979256"></a>Ignoring·Certain·Columns</h4></div></div></div><p> | 806 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149012024"></a>Ignoring·Certain·Columns</h4></div></div></div><p> |
| 807 | Sometimes·a·text·is·very·strictly·formatted,·and·contains·columns·that·you·always·want·to·ignore,·while·there·are | 807 | Sometimes·a·text·is·very·strictly·formatted,·and·contains·columns·that·you·always·want·to·ignore,·while·there·are |
| 808 | other·columns·you·want·to·preserve·for·analysis.·In·the·following·example·the·first·five·columns·(characters)·are· | 808 | other·columns·you·want·to·preserve·for·analysis.·In·the·following·example·the·first·five·columns·(characters)·are· |
| 809 | ignored,·the·next·ten·columns·are·preserved,·then·again·five·columns·are·ignored·and·the·rest·of·the·line·is·preserved. | 809 | ignored,·the·next·ten·columns·are·preserved,·then·again·five·columns·are·ignored·and·the·rest·of·the·line·is·preserved. |
| 810 | </p><pre·class="screen"> | 810 | </p><pre·class="screen"> |
| 811 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/.....\(..........\).....\(.*\)/\1\2/' | 811 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/.....\(..........\).....\(.*\)/\1\2/' |
| 812 | </pre><p> | 812 | </pre><p> |
| 813 | Each·dot·'.'·matches·any·single·character.·The·"\1"·and·"\2"·in·the·replacement·string·refer·to·the·matched·text·within·the·first· | 813 | Each·dot·'.'·matches·any·single·character.·The·"\1"·and·"\2"·in·the·replacement·string·refer·to·the·matched·text·within·the·first· |
| 814 | and·second·pair·of·"\("·and·"\)"·denoting·the·text·to·be·preserved. | 814 | and·second·pair·of·"\("·and·"\)"·denoting·the·text·to·be·preserved. |
| 815 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148981048"></a>Combining·Several·Substitutions</h4></div></div></div><p> | 815 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149013816"></a>Combining·Several·Substitutions</h4></div></div></div><p> |
| 816 | Sometimes·you·want·to·apply·several·substitutions·at·once.·You·can·then·use·the· | 816 | Sometimes·you·want·to·apply·several·substitutions·at·once.·You·can·then·use·the· |
| 817 | semicolon·';'·to·separate·these·from·each·other.·Example: | 817 | semicolon·';'·to·separate·these·from·each·other.·Example: |
| 818 | </p><pre·class="screen"> | 818 | </p><pre·class="screen"> |
| 819 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>echo</strong></span></span>·abrakadabra·|·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/a/o/g;s/\(.*\)/\U\1/' | 819 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>echo</strong></span></span>·abrakadabra·|·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/a/o/g;s/\(.*\)/\U\1/' |
| 820 | ···->·OBROKODOBRO | 820 | ···->·OBROKODOBRO |
| 821 | </pre><p> | 821 | </pre><p> |
| 822 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp148995512"></a>Using·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·instead·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span></h4></div></div></div><p> | 822 | </p></div><div·class="sect3"><div·class="titlepage"><div><div><h4·class="title"><a·name="idp149036472"></a>Using·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·instead·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span></h4></div></div></div><p> |
| 823 | Instead·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·you·might·want·to·use·something·else·like· | 823 | Instead·of·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·you·might·want·to·use·something·else·like· |
| 824 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>. | 824 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>. |
| 825 | </p><pre·class="screen"> | 825 | </p><pre·class="screen"> |
| 826 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·-p·-e·'s/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>REGEXP</code></em></span>/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>REPLACEMENT</code></em></span>/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>FLAGS</code></em></span>' | 826 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·-p·-e·'s/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>REGEXP</code></em></span>/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>REPLACEMENT</code></em></span>/<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>FLAGS</code></em></span>' |
| 827 | </pre><p> | 827 | </pre><p> |
| 828 | But·some·details·are·different·in·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>.·Note·that·where· | 828 | But·some·details·are·different·in·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>.·Note·that·where· |
| 829 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·needed·"\("·and·"\)"·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span> | 829 | <span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·needed·"\("·and·"\)"·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span> |
| 830 | requires·the·simpler·"("·and·")"·without·preceding·'\'.·Example: | 830 | requires·the·simpler·"("·and·")"·without·preceding·'\'.·Example: |
| 831 | </p><pre·class="screen"> | 831 | </p><pre·class="screen"> |
| 832 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\(.*\)/\U\1/' | 832 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>sed</strong></span></span>·'s/\(.*\)/\U\1/' |
| 833 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·-p·-e·'s/(.*)/\U\1/' | 833 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>perl</strong></span></span>·-p·-e·'s/(.*)/\U\1/' |
| 834 | </pre><p> | 834 | </pre><p> |
| 835 | </p></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149002296"></a>Order·Of·Preprocessor·Execution</h3></div></div></div><p> | 835 | </p></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149055544"></a>Order·Of·Preprocessor·Execution</h3></div></div></div><p> |
| 836 | The·data·is·piped·through·all·internal·and·external·preprocessors·in·the· | 836 | The·data·is·piped·through·all·internal·and·external·preprocessors·in·the· |
| 837 | following·order: | 837 | following·order: |
| 838 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Normal·preprocessor,</p></li><li·class="listitem"><p>Line-Matching-Preprocessor,</p></li><li·class="listitem"><p>Ignore·case·(conversion·to·uppercase),</p></li><li·class="listitem"><p>Detection·of·C/C++·comments,</p></li><li·class="listitem"><p>Ignore·numbers,</p></li><li·class="listitem"><p>Ignore·white·space</p></li></ul></div><p> | 838 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Normal·preprocessor,</p></li><li·class="listitem"><p>Line-Matching-Preprocessor,</p></li><li·class="listitem"><p>Ignore·case·(conversion·to·uppercase),</p></li><li·class="listitem"><p>Detection·of·C/C++·comments,</p></li><li·class="listitem"><p>Ignore·numbers,</p></li><li·class="listitem"><p>Ignore·white·space</p></li></ul></div><p> |
| 839 | The·data·after·the·normal·preprocessor·will·be·preserved·for·display·and·merging.·The | 839 | The·data·after·the·normal·preprocessor·will·be·preserved·for·display·and·merging.·The |
| 840 | other·operations·only·modify·the·data·that·the·line-matching-diff-algorithm·sees. | 840 | other·operations·only·modify·the·data·that·the·line-matching-diff-algorithm·sees. |
| 841 | </p><p> | 841 | </p><p> |
| 842 | In·the·rare·cases·where·you·use·a·normal·preprocessor·note·that· | 842 | In·the·rare·cases·where·you·use·a·normal·preprocessor·note·that· |
| 843 | the·line-matching-preprocessor·sees·the·output·of·the·normal·preprocessor·as·input. | 843 | the·line-matching-preprocessor·sees·the·output·of·the·normal·preprocessor·as·input. |
| 844 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149007416"></a>Warning</h3></div></div></div><p> | 844 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149060664"></a>Warning</h3></div></div></div><p> |
| 845 | The·preprocessor-commands·are·often·very·useful,·but·as·with·any·option·that·modifies | 845 | The·preprocessor-commands·are·often·very·useful,·but·as·with·any·option·that·modifies |
| 846 | your·texts·or·hides·away·certain·differences·automatically,·you·might·accidentally·overlook· | 846 | your·texts·or·hides·away·certain·differences·automatically,·you·might·accidentally·overlook· |
| 847 | certain·differences·and·in·the·worst·case·destroy·important·data. | 847 | certain·differences·and·in·the·worst·case·destroy·important·data. |
| 848 | </p><p> | 848 | </p><p> |
| 849 | For·this·reason·during·a·merge·if·a·normal·preprocessor-command·is·being·used·<span·class="application">KDiff3</span>· | 849 | For·this·reason·during·a·merge·if·a·normal·preprocessor-command·is·being·used·<span·class="application">KDiff3</span>· |
| 850 | will·tell·you·so·and·ask·you·if·it·should·be·disabled·or·not.· | 850 | will·tell·you·so·and·ask·you·if·it·should·be·disabled·or·not.· |
| 851 | But·it·won't·warn·you·if·a·Line-Matching-Preprocessor-command·is·active.·The·merge·will·not·complete·until | 851 | But·it·won't·warn·you·if·a·Line-Matching-Preprocessor-command·is·active.·The·merge·will·not·complete·until |
| Offset 877, 20 lines modified | Offset 877, 20 lines modified |
| 877 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>...·reads·and·compares·two·or·three·directories·recursively,</p></li><li·class="listitem"><p>...·takes·special·care·of·symbolic·links,</p></li><li·class="listitem"><p>...·lets·you·browse·files·on·mouse·double·click,</p></li><li·class="listitem"><p>...·for·each·item·proposes·a·merge·operation,·which·you·can·change | 877 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>...·reads·and·compares·two·or·three·directories·recursively,</p></li><li·class="listitem"><p>...·takes·special·care·of·symbolic·links,</p></li><li·class="listitem"><p>...·lets·you·browse·files·on·mouse·double·click,</p></li><li·class="listitem"><p>...·for·each·item·proposes·a·merge·operation,·which·you·can·change |
| 878 | ·························before·starting·the·directory·merge,</p></li><li·class="listitem"><p>...·lets·you·simulate·the·merge·and·lists·the·actions·that·would | 878 | ·························before·starting·the·directory·merge,</p></li><li·class="listitem"><p>...·lets·you·simulate·the·merge·and·lists·the·actions·that·would |
| 879 | ·························take··place,·without·actually·doing·them,</p></li><li·class="listitem"><p>...·lets·you·really·do·the·merge,·and·lets·you·interact·whenever | 879 | ·························take··place,·without·actually·doing·them,</p></li><li·class="listitem"><p>...·lets·you·really·do·the·merge,·and·lets·you·interact·whenever |
| 880 | ·························manual·interaction·is·needed,</p></li><li·class="listitem"><p>...·lets·you·run·the·selected·operation·for·all·items·(key·F7)·or·the·selected·item·(key·F6),</p></li><li·class="listitem"><p>...·lets·you·continue·the·merge·after·manual·interaction·with·key·F7,</p></li><li·class="listitem"><p>...·optionally·creates·backups,·with·the·".orig"·extension,</p></li><li·class="listitem"><p>...</p></li></ul></div></div><FILENAME·filename="startingdirmerge.html"><html><head><title>Starting·Directory·Comparison·Or·Merge</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.76.1"><meta·name="keywords"·content="KDE,·kdeextragear,·kdiff3,·diff,·merge,·CVS,·triplediff,·compare,·files,·directories,·version·control,·three-way-merge,·in-line-differences,·synchronise,·kpart,·✂ | 880 | ·························manual·interaction·is·needed,</p></li><li·class="listitem"><p>...·lets·you·run·the·selected·operation·for·all·items·(key·F7)·or·the·selected·item·(key·F6),</p></li><li·class="listitem"><p>...·lets·you·continue·the·merge·after·manual·interaction·with·key·F7,</p></li><li·class="listitem"><p>...·optionally·creates·backups,·with·the·".orig"·extension,</p></li><li·class="listitem"><p>...</p></li></ul></div></div><FILENAME·filename="startingdirmerge.html"><html><head><title>Starting·Directory·Comparison·Or·Merge</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.76.1"><meta·name="keywords"·content="KDE,·kdeextragear,·kdiff3,·diff,·merge,·CVS,·triplediff,·compare,·files,·directories,·version·control,·three-way-merge,·in-line-differences,·synchronise,·kpart,·✂ |
| 881 | ···This·is·very·similar·to·the·single·file·merge·and·comparison.·You·just | 881 | ···This·is·very·similar·to·the·single·file·merge·and·comparison.·You·just |
| 882 | ···have··to·specify·directories·on·the·command·line·or·in·the·file-open | 882 | ···have··to·specify·directories·on·the·command·line·or·in·the·file-open |
| 883 | ···dialog. | 883 | ···dialog. |
| 884 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149020728"></a>Compare/Merge·two·directories:·</h3></div></div></div><pre·class="screen"> | 884 | </p><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149073976"></a>Compare/Merge·two·directories:·</h3></div></div></div><pre·class="screen"> |
| 885 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span> | 885 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span> |
| 886 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> | 886 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> |
| 887 | </pre><p> | 887 | </pre><p> |
| 888 | ···If·no·destination·directory·is·specified,·then·<span·class="application">KDiff3</span>·will·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir2</code></em></span>. | 888 | ···If·no·destination·directory·is·specified,·then·<span·class="application">KDiff3</span>·will·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir2</code></em></span>. |
| 889 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149024824"></a>Compare/Merge·three·directories:·</h3></div></div></div><pre·class="screen"> | 889 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149078072"></a>Compare/Merge·three·directories:·</h3></div></div></div><pre·class="screen"> |
| 890 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span> | 890 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span> |
| 891 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> | 891 | ···<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="command"><span·class="command"><strong>kdiff3</strong></span></span>·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1·dir2·dir3</code></em></span>·-o·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>destdir</code></em></span> |
| 892 | </pre><p> | 892 | </pre><p> |
| 893 | ···When·three·directories·are·merged·then·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1</code></em></span> | 893 | ···When·three·directories·are·merged·then·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir1</code></em></span> |
| 894 | ···is·used·as·the·base·for·the·merge. | 894 | ···is·used·as·the·base·for·the·merge. |
| 895 | ···If·no·destination·directory·is·specified,·then·<span·class="application">KDiff3</span>·will·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir3</code></em></span> | 895 | ···If·no·destination·directory·is·specified,·then·<span·class="application">KDiff3</span>·will·use·<span·xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"·class="replaceable"><em·class="replaceable"><code>dir3</code></em></span> |
| 896 | ···as·the··destination·directory·for·the·merge. | 896 | ···as·the··destination·directory·for·the·merge. |
| Offset 1115, 46 lines modified | Offset 1115, 46 lines modified |
| 1115 | ·········Default·is·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Copy·newer·instead·of·merging:</em></span></span></dt><dd><p>·Instead·of·merging·the·proposed | 1115 | ·········Default·is·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Copy·newer·instead·of·merging:</em></span></span></dt><dd><p>·Instead·of·merging·the·proposed |
| 1116 | ·········operation·will·copy·the·newer·source·if·changes·happened.·(Considered·unsafe, | 1116 | ·········operation·will·copy·the·newer·source·if·changes·happened.·(Considered·unsafe, |
| 1117 | ·········because·it·implies·that·you·know,·that·the·other·file·hasn't·been·edited | 1117 | ·········because·it·implies·that·you·know,·that·the·other·file·hasn't·been·edited |
| 1118 | ·········too.·Check·to·make·sure·in·every·case.)·Default·is·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Backup·files:</em></span></span></dt><dd><p>·If·a·file·or·complete·directory·is·replaced | 1118 | ·········too.·Check·to·make·sure·in·every·case.)·Default·is·off.</p></dd><dt><span·class="term"><span·class="emphasis"><em>Backup·files:</em></span></span></dt><dd><p>·If·a·file·or·complete·directory·is·replaced |
| 1119 | ·········by··another·or·is·deleted·then·the·original·version·will·be·renamed·with·an | 1119 | ·········by··another·or·is·deleted·then·the·original·version·will·be·renamed·with·an |
| 1120 | ·········".orig"··extension.·If·an·old·backup·file·with·".orig"·extension·already·exists | 1120 | ·········".orig"··extension.·If·an·old·backup·file·with·".orig"·extension·already·exists |
| 1121 | ·········then··this·will·be·deleted·without·backup.·This·also·affects·the·normal·merging | 1121 | ·········then··this·will·be·deleted·without·backup.·This·also·affects·the·normal·merging |
| 1122 | ·········of·single·files,·not·only·in·directory-merge·mode.·Default·is·on.</p></dd></dl></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="dothemerge.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="other.html">Next</a></td></tr><tr><td·class="prevCell">Doing·A·Directory·Merge </td><td·class="upCell">Directory·Comparison·and·Merge·with·<span·class="application">KDiff3</span></td><td·class="nextCell"> Other·Functions·in·Directory·Merge·Window</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></FILENAME><FILENAME·filename="other.html"><html><head><title>Other·Functions·in·Directory·Merge·Window</title><link·rel="stylesheet"·type="text/css"·href="help:·✂ | 1122 | ·········of·single·files,·not·only·in·directory-merge·mode.·Default·is·on.</p></dd></dl></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="dothemerge.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="other.html">Next</a></td></tr><tr><td·class="prevCell">Doing·A·Directory·Merge </td><td·class="upCell">Directory·Comparison·and·Merge·with·<span·class="application">KDiff3</span></td><td·class="nextCell"> Other·Functions·in·Directory·Merge·Window</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></FILENAME><FILENAME·filename="other.html"><html><head><title>Other·Functions·in·Directory·Merge·Window</title><link·rel="stylesheet"·type="text/css"·href="help:·✂ |
| 1123 | ···Usually·the·directory·merge·list·view·remains·visible·while·a·single·file | 1123 | ···Usually·the·directory·merge·list·view·remains·visible·while·a·single·file |
| 1124 | ···is·compared·or·merged.·With·the·mouse·you·can·move·the·the·splitter·bar·that | 1124 | ···is·compared·or·merged.·With·the·mouse·you·can·move·the·the·splitter·bar·that |
| 1125 | ···separates·the·file·list·from·the·text-diff·windows.·If·you·don't·want·this, | 1125 | ···separates·the·file·list·from·the·text-diff·windows.·If·you·don't·want·this, |
| 1126 | ···you·can·disable·"Split·Screen·View"·in·the·"Directory"-menu.·Then·you·can | 1126 | ···you·can·disable·"Split·Screen·View"·in·the·"Directory"-menu.·Then·you·can |
| 1127 | ···use·"Toggle·View"·in·the·"Directory"-menu·to·switch·between·the·file·list | 1127 | ···use·"Toggle·View"·in·the·"Directory"-menu·to·switch·between·the·file·list |
| 1128 | ···and·the·text-diff·view·that·then·occupy·the·full·screen. | 1128 | ···and·the·text-diff·view·that·then·occupy·the·full·screen. |
| 1129 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149125432"></a>Comparing·or·Merging·a·Single·File</h3></div></div></div><p> | 1129 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149178680"></a>Comparing·or·Merging·a·Single·File</h3></div></div></div><p> |
| 1130 | ···Probably·you·will·prefer·a·simple·double·mouse·click·on·a·file·in·order | 1130 | ···Probably·you·will·prefer·a·simple·double·mouse·click·on·a·file·in·order |
| 1131 | ···to·compare·it.·Nevertheless·there·also·exists·an·entry·in·the·"Directory"-menu. | 1131 | ···to·compare·it.·Nevertheless·there·also·exists·an·entry·in·the·"Directory"-menu. |
| 1132 | ···You·can·also·directly·merge·a·single·file·by·selecting·it·and· | 1132 | ···You·can·also·directly·merge·a·single·file·by·selecting·it·and· |
| 1133 | ···choosing·"Merge·current·file"·in·the·"Merge"-Menu.·On·saving·the | 1133 | ···choosing·"Merge·current·file"·in·the·"Merge"-Menu.·On·saving·the |
| 1134 | ···result,·the·status·will·be·set·to·done,·and·the·file·will·not·be·merged·again | 1134 | ···result,·the·status·will·be·set·to·done,·and·the·file·will·not·be·merged·again |
| 1135 | ···if·a·directory·merge·is·started. | 1135 | ···if·a·directory·merge·is·started. |
| 1136 | </p><p> | 1136 | </p><p> |
| 1137 | ···But·note·that·this·status·information·will·be·lost·when·you·rerun·a·directory | 1137 | ···But·note·that·this·status·information·will·be·lost·when·you·rerun·a·directory |
| 1138 | ···scan:·"Directory"-menu:·"Rescan" | 1138 | ···scan:·"Directory"-menu:·"Rescan" |
| 1139 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149126840"></a>Comparing·or·Merging·Files·with·Different·Names</h3></div></div></div><p> | 1139 | </p></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149180088"></a>Comparing·or·Merging·Files·with·Different·Names</h3></div></div></div><p> |
| 1140 | ···Sometimes·you·need·to·compare·or·merge·files·with·different·names·(e.g.·the·current· | 1140 | ···Sometimes·you·need·to·compare·or·merge·files·with·different·names·(e.g.·the·current· |
| 1141 | ···file·and·the·backup·in·the·same·folder). | 1141 | ···file·and·the·backup·in·the·same·folder). |
| 1142 | </p><p> | 1142 | </p><p> |
| 1143 | ···Select·the·exact·file·by·clicking·onto·the·icon·in·the·column·A,·B·or·C.·The·first· | 1143 | ···Select·the·exact·file·by·clicking·onto·the·icon·in·the·column·A,·B·or·C.·The·first· |
| 1144 | ···file·selected·thus·will·be·marked·with·an·"A",·the·second·and·third·with·"B"·and·"C"· | 1144 | ···file·selected·thus·will·be·marked·with·an·"A",·the·second·and·third·with·"B"·and·"C"· |
| 1145 | ···regardless·on·what·column·they·are·in.·Only·up·to·three·files·can·be·chosen·like·this. | 1145 | ···regardless·on·what·column·they·are·in.·Only·up·to·three·files·can·be·chosen·like·this. |
| 1146 | </p><p> | 1146 | </p><p> |
| 1147 | ···Proceed·by·choosing·"Compare·Explicitely·Selected·Files"·or·"Merge·Explicitely· | 1147 | ···Proceed·by·choosing·"Compare·Explicitely·Selected·Files"·or·"Merge·Explicitely· |
| 1148 | ···Selected·Files"·from·the·"Directory"-menu.·For·your·convenience·these·menu·entries· | 1148 | ···Selected·Files"·from·the·"Directory"-menu.·For·your·convenience·these·menu·entries· |
| 1149 | ···also·appear·as·context·menu·when·you·right-click·the·last·selected·file. | 1149 | ···also·appear·as·context·menu·when·you·right-click·the·last·selected·file. |
| 1150 | </p><p> | 1150 | </p><p> |
| 1151 | ···The·comparison·or·merge·of·a·file·will·happen·in·the·same·window.· | 1151 | ···The·comparison·or·merge·of·a·file·will·happen·in·the·same·window.· |
| 1152 | ···If·this·method·is·used·for·directories·a·new·window·will·be·opened. | 1152 | ···If·this·method·is·used·for·directories·a·new·window·will·be·opened. |
| 1153 | </p></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="dirmergeoptions.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="misc.html">Next</a></td></tr><tr><td·class="prevCell">Options·for·Comparing·and·Merging·Directories </td><td·class="upCell">Directory·Comparison·and·Merge·with·<span·class="application">KDiff3</span></td><td·class="nextCell"> Miscellaneous·Topics</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></FILENAME></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="preprocessors.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td·✂ | 1153 | </p></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="dirmergeoptions.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="misc.html">Next</a></td></tr><tr><td·class="prevCell">Options·for·Comparing·and·Merging·Directories </td><td·class="upCell">Directory·Comparison·and·Merge·with·<span·class="application">KDiff3</span></td><td·class="nextCell"> Miscellaneous·Topics</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></FILENAME></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="preprocessors.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td·✂ |
| 1154 | KDE·supports·networktransparency·via·KIO-slaves.·<span·class="application">KDiff3</span>·uses·this | 1154 | KDE·supports·networktransparency·via·KIO-slaves.·<span·class="application">KDiff3</span>·uses·this |
| 1155 | for·reading·input·files·and·for·scanning·directories. | 1155 | for·reading·input·files·and·for·scanning·directories. |
| 1156 | This·means·that·you·can·specify·files·and·directories·on·local·and | 1156 | This·means·that·you·can·specify·files·and·directories·on·local·and |
| 1157 | remote·resources·via·URLs. | 1157 | remote·resources·via·URLs. |
| 1158 | </p><p> | 1158 | </p><p> |
| 1159 | Example: | 1159 | Example: |
| 1160 | </p><p> | 1160 | </p><p> |
| Offset 1164, 26 lines modified | Offset 1164, 26 lines modified |
| 1164 | </pre><p> | 1164 | </pre><p> |
| 1165 | </p><p>The·first·line·compares·a·local·file·with·a·file·on·an·FTP-server.·The·second·line | 1165 | </p><p>The·first·line·compares·a·local·file·with·a·file·on·an·FTP-server.·The·second·line |
| 1166 | compares·a·directory·within·an·compressed·archive·with·a·local·directory. | 1166 | compares·a·directory·within·an·compressed·archive·with·a·local·directory. |
| 1167 | </p><p> | 1167 | </p><p> |
| 1168 | Other·KIO-slaves·that·are·interesting·are: | 1168 | Other·KIO-slaves·that·are·interesting·are: |
| 1169 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Files·from·the·WWW·(http:),</p></li><li·class="listitem"><p>Files·from·the·FTP·(ftp:),</p></li><li·class="listitem"><p>Encrypted·file·transfer·(fish:,·sftp:),</p></li><li·class="listitem"><p>Windows-ressources·(smb:),</p></li><li·class="listitem"><p>Local·files·(file:),</p></li></ul></div><p> | 1169 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Files·from·the·WWW·(http:),</p></li><li·class="listitem"><p>Files·from·the·FTP·(ftp:),</p></li><li·class="listitem"><p>Encrypted·file·transfer·(fish:,·sftp:),</p></li><li·class="listitem"><p>Windows-ressources·(smb:),</p></li><li·class="listitem"><p>Local·files·(file:),</p></li></ul></div><p> |
| 1170 | Other·things·that·are·possible,·but·probably·less·useful·are: | 1170 | Other·things·that·are·possible,·but·probably·less·useful·are: |
| 1171 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Man-pages·(man:),</p></li><li·class="listitem"><p>Info-pages·(info:),</p></li></ul></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149159224"></a>How·To·Write·URLs</h3></div></div></div><p> | 1171 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p>Man-pages·(man:),</p></li><li·class="listitem"><p>Info-pages·(info:),</p></li></ul></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149191992"></a>How·To·Write·URLs</h3></div></div></div><p> |
| 1172 | ···An·URL·has·a·different·syntax·compared·with·paths·for·local·files·and·directories. | 1172 | ···An·URL·has·a·different·syntax·compared·with·paths·for·local·files·and·directories. |
| 1173 | ···Some·things·should·be·considered: | 1173 | ···Some·things·should·be·considered: |
| 1174 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p> | 1174 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p> |
| 1175 | ···A·path·can·be·relative·and·can·contain·"."·or·"..".·This·is·not·possible·for·URLs | 1175 | ···A·path·can·be·relative·and·can·contain·"."·or·"..".·This·is·not·possible·for·URLs |
| 1176 | ···which·are·always·absolute. | 1176 | ···which·are·always·absolute. |
| 1177 | </p></li><li·class="listitem"><p> | 1177 | </p></li><li·class="listitem"><p> |
| 1178 | ···Special·characters·must·be·written·with·"escaping".·("#"->"%23",·space->"%20",·etc.) | 1178 | ···Special·characters·must·be·written·with·"escaping".·("#"->"%23",·space->"%20",·etc.) |
| 1179 | ···E.g.·A·file·with·the·name·"/#foo#"·would·have·the·URL·"file:/%23foo%23". | 1179 | ···E.g.·A·file·with·the·name·"/#foo#"·would·have·the·URL·"file:/%23foo%23". |
| 1180 | </p></li><li·class="listitem"><p> | 1180 | </p></li><li·class="listitem"><p> |
| 1181 | ···When·URLs·don't·work·as·expected,·try·to·open·them·in·Konqueror·first. | 1181 | ···When·URLs·don't·work·as·expected,·try·to·open·them·in·Konqueror·first. |
| 1182 | </p></li></ul></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149162168"></a>Capabilities·of·KIO-Slaves</h3></div></div></div><p> | 1182 | </p></li></ul></div></div><div·class="sect2"><div·class="titlepage"><div><div><h3·class="title"><a·name="idp149194936"></a>Capabilities·of·KIO-Slaves</h3></div></div></div><p> |
| 1183 | ···Networktransparency·has·one·drawback:·Not·all·ressources·have·the·same·cababilities. | 1183 | ···Networktransparency·has·one·drawback:·Not·all·ressources·have·the·same·cababilities. |
| 1184 | </p><p> | 1184 | </p><p> |
| 1185 | ···Sometimes·this·is·due·to·the·file·system·of·the·server,·sometimes·due·to·the·protocol. | 1185 | ···Sometimes·this·is·due·to·the·file·system·of·the·server,·sometimes·due·to·the·protocol. |
| 1186 | ···Here·is·a·short·list·of·restrictions: | 1186 | ···Here·is·a·short·list·of·restrictions: |
| 1187 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p> | 1187 | </p><div·class="itemizedlist"><ul·class="itemizedlist"·type="disc"><li·class="listitem"><p> |
| 1188 | ···Sometimes·there·is·no·support·for·links. | 1188 | ···Sometimes·there·is·no·support·for·links. |
| 1189 | </p></li><li·class="listitem"><p> | 1189 | </p></li><li·class="listitem"><p> |
| Offset 1215, 107 lines modified | Offset 1215, 107 lines modified |
| 1215 | the·contextmenu.·Be·aware·that·this·won't·work·if·none·of·the·original·files·are | 1215 | the·contextmenu.·Be·aware·that·this·won't·work·if·none·of·the·original·files·are |
| 1216 | available,·and·it·is·not·reliable·if·the·original·file(s)·have·changed·since·the | 1216 | available,·and·it·is·not·reliable·if·the·original·file(s)·have·changed·since·the |
| 1217 | patch-file·was·generated. | 1217 | patch-file·was·generated. |
| 1218 | </p><p> | 1218 | </p><p> |
| 1219 | When·run·as·a·part·<span·class="application">KDiff3</span>·only·provides·the·a·two-file-diff,·a·very·small·toolbar | 1219 | When·run·as·a·part·<span·class="application">KDiff3</span>·only·provides·the·a·two-file-diff,·a·very·small·toolbar |
| 1220 | and·menu.·Merging·or·directory-comparison·are·not·supported·then. | 1220 | and·menu.·Merging·or·directory-comparison·are·not·supported·then. |
| 1221 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="misc.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="faq.html">Next</a></td></tr><tr><td·class="prevCell">Miscellaneous·Topics </td><td·class="upCell">Miscellaneous·Topics</td><td·class="nextCell"> Questions·and·Answers</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></FILENAME></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="other.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="kpart.html">Next</a></td></tr><tr><td·class="prevCell">Other·✂ | 1221 | </p></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="misc.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="faq.html">Next</a></td></tr><tr><td·class="prevCell">Miscellaneous·Topics </td><td·class="upCell">Miscellaneous·Topics</td><td·class="nextCell"> Questions·and·Answers</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></FILENAME></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="other.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="kpart.html">Next</a></td></tr><tr><td·class="prevCell">Other·✂ |
| 1222 | You·can·find·the·latest·version·at·<a·class="ulink"·href="http://docs.kde.org/"·target="_top">http://docs.kde.org/</a>.</p><div·class="qandaset"><a·name="faqlist"></a><dl><dt>5.1.·<a·href="faq.html#idp149184312"> | 1222 | You·can·find·the·latest·version·at·<a·class="ulink"·href="http://docs.kde.org/"·target="_top">http://docs.kde.org/</a>.</p><div·class="qandaset"><a·name="faqlist"></a><dl><dt>5.1.·<a·href="faq.html#idp149208888"> |
| 1223 | ···Why·is·it·called·"KDiff3"? | 1223 | ···Why·is·it·called·"KDiff3"? |
| 1224 | </a></dt><dt>5.2.·<a·href="faq.html#idp149185720"> | 1224 | </a></dt><dt>5.2.·<a·href="faq.html#idp149210296"> |
| 1225 | ···Why·did·I·release·it·under·GPL? | 1225 | ···Why·did·I·release·it·under·GPL? |
| 1226 | </a></dt><dt>5.3.·<a·href="faq.html#idp149186744"> | 1226 | </a></dt><dt>5.3.·<a·href="faq.html#idp149211320"> |
| 1227 | ···Some·buttons·and·functions·are·missing.·What's·wrong? | 1227 | ···Some·buttons·and·functions·are·missing.·What's·wrong? |
| 1228 | </a></dt><dt>5.4.·<a·href="faq.html#idp149187768"> | 1228 | </a></dt><dt>5.4.·<a·href="faq.html#idp149212344"> |
| 1229 | ···Often·lines·that·are·similar·but·not·identical·appear·next·to·each·other | 1229 | ···Often·lines·that·are·similar·but·not·identical·appear·next·to·each·other |
| 1230 | ···but·sometimes·not.·Why? | 1230 | ···but·sometimes·not.·Why? |
| 1231 | </a></dt><dt>5.5.·<a·href="faq.html#idp149189304"> | 1231 | </a></dt><dt>5.5.·<a·href="faq.html#idp149213880"> |
| 1232 | ···Why·must·all·conflicts·be·solved·before·the·merge·result·can·be·saved? | 1232 | ···Why·must·all·conflicts·be·solved·before·the·merge·result·can·be·saved? |
| 1233 | </a></dt><dt>5.6.·<a·href="faq.html#idp149190328"> | 1233 | </a></dt><dt>5.6.·<a·href="faq.html#idp149214904"> |
| 1234 | ···How·can·I·synchronise·the·diff·and·merge·views,·so·that·all·views·show·the·same·text·position? | 1234 | ···How·can·I·synchronise·the·diff·and·merge·views,·so·that·all·views·show·the·same·text·position? |
| 1235 | </a></dt><dt>5.7.·<a·href="faq.html#idp149191864"> | 1235 | </a></dt><dt>5.7.·<a·href="faq.html#idp149216440"> |
| 1236 | ···Why·does·the·editor·in·the·merge·result·window·not·have·an·"undo"-function? | 1236 | ···Why·does·the·editor·in·the·merge·result·window·not·have·an·"undo"-function? |
| 1237 | </a></dt><dt>5.8.·<a·href="faq.html#idp149192888"> | 1237 | </a></dt><dt>5.8.·<a·href="faq.html#idp149217464"> |
| 1238 | ···When·I·removed·some·text,·then·suddenly·"<No·src·line>"·appeared | 1238 | ···When·I·removed·some·text,·then·suddenly·"<No·src·line>"·appeared |
| 1239 | ···and·cannot·be·deleted.·What·does·that·mean·and·how·can·one·remove·this? | 1239 | ···and·cannot·be·deleted.·What·does·that·mean·and·how·can·one·remove·this? |
| 1240 | </a></dt><dt>5.9.·<a·href="faq.html#idp149193912"> | 1240 | </a></dt><dt>5.9.·<a·href="faq.html#idp149218488"> |
| 1241 | ···Why·doesn't·KDiff3·support·syntax-highlighting? | 1241 | ···Why·doesn't·KDiff3·support·syntax-highlighting? |
| 1242 | </a></dt><dt>5.10.·<a·href="faq.html#idp149195704"> | 1242 | </a></dt><dt>5.10.·<a·href="faq.html#idp149220280"> |
| 1243 | ···Can·I·use·KDiff3·to·compare·OpenOffice.Org,·Word,·Excel,·PDF-,·etc.·files? | 1243 | ···Can·I·use·KDiff3·to·compare·OpenOffice.Org,·Word,·Excel,·PDF-,·etc.·files? |
| 1244 | </a></dt><dt>5.11.·<a·href="faq.html#idp149201336"> | 1244 | </a></dt><dt>5.11.·<a·href="faq.html#idp149225912"> |
| 1245 | ···Where·has·the·the·directory·option·"List·only·deltas"·gone? | 1245 | ···Where·has·the·the·directory·option·"List·only·deltas"·gone? |
| 1246 | </a></dt><dt>5.12.·<a·href="faq.html#idp149203000"> | 1246 | </a></dt><dt>5.12.·<a·href="faq.html#idp149227576"> |
| 1247 | ···How·can·I·make·a·big·selection·in·the·diff·input·window | 1247 | ···How·can·I·make·a·big·selection·in·the·diff·input·window |
| 1248 | ···because·scrolling·takes·so·long? | 1248 | ···because·scrolling·takes·so·long? |
| 1249 | </a></dt><dt>5.13.·<a·href="faq.html#idp149204536"> | 1249 | </a></dt><dt>5.13.·<a·href="faq.html#idp149229112"> |
| 1250 | ···There·is·so·much·information·here,·but·your·question·is·still·not·answered? | 1250 | ···There·is·so·much·information·here,·but·your·question·is·still·not·answered? |
| 1251 | </a></dt></dl><table·border="0"·width="100%"·summary="Q·and·A·Set"><col·align="left"·width="1%"><col><tbody><tr·class="question"><td·align="left"·valign="top"><a·name="idp149184312"></a><a·name="idp149184440"></a><p><b>5.1.</b></p></td><td·align="left"·valign="top"><p> | 1251 | </a></dt></dl><table·border="0"·width="100%"·summary="Q·and·A·Set"><col·align="left"·width="1%"><col><tbody><tr·class="question"><td·align="left"·valign="top"><a·name="idp149208888"></a><a·name="idp149209016"></a><p><b>5.1.</b></p></td><td·align="left"·valign="top"><p> |
| 1252 | ···Why·is·it·called·"<span·class="application">KDiff3</span>"? | 1252 | ···Why·is·it·called·"<span·class="application">KDiff3</span>"? |
| 1253 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1253 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1254 | ···Tools·named·"KDiff"·and·"KDiff2"·(now·called·"Kompare")·already·exist.·Also·"KDiff3"·should·suggest | 1254 | ···Tools·named·"KDiff"·and·"KDiff2"·(now·called·"Kompare")·already·exist.·Also·"KDiff3"·should·suggest |
| 1255 | ···that·it·can·merge·like·the·"diff3"-tool·in·the·Diff-Tool·collection. | 1255 | ···that·it·can·merge·like·the·"diff3"-tool·in·the·Diff-Tool·collection. |
| 1256 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149185720"></a><a·name="idp149185848"></a><p><b>5.2.</b></p></td><td·align="left"·valign="top"><p> | 1256 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149210296"></a><a·name="idp149210424"></a><p><b>5.2.</b></p></td><td·align="left"·valign="top"><p> |
| 1257 | ···Why·did·I·release·it·under·GPL? | 1257 | ···Why·did·I·release·it·under·GPL? |
| 1258 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1258 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1259 | ···I'm·using·GPL·programs·for·a·very·long·time·now·and·learned·very·much | 1259 | ···I'm·using·GPL·programs·for·a·very·long·time·now·and·learned·very·much |
| 1260 | ···by··having·a·look·at·many·of·the·sources.·Hence·this·is·my·"Thank·You" | 1260 | ···by··having·a·look·at·many·of·the·sources.·Hence·this·is·my·"Thank·You" |
| 1261 | ···to···all··programmers·that·also·did·so·or·will·do·the·same. | 1261 | ···to···all··programmers·that·also·did·so·or·will·do·the·same. |
| 1262 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149186744"></a><a·name="idp149186872"></a><p><b>5.3.</b></p></td><td·align="left"·valign="top"><p> | 1262 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149211320"></a><a·name="idp149211448"></a><p><b>5.3.</b></p></td><td·align="left"·valign="top"><p> |
| 1263 | ···Some·buttons·and·functions·are·missing.·What's·wrong? | 1263 | ···Some·buttons·and·functions·are·missing.·What's·wrong? |
| 1264 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1264 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1265 | ···You·compiled·from·source·but·you·probably·didn't·specify·the·correct·KDE-prefix | 1265 | ···You·compiled·from·source·but·you·probably·didn't·specify·the·correct·KDE-prefix |
| 1266 | ···with·configure.·By·default·configure·wants·to·install·in·/usr/local·but·then·KDE·can't | 1266 | ···with·configure.·By·default·configure·wants·to·install·in·/usr/local·but·then·KDE·can't |
| 1267 | ···find·the·user-interface·ressource·file·(i.e.·kdiff3ui.rc).·The·README-file·contains | 1267 | ···find·the·user-interface·ressource·file·(i.e.·kdiff3ui.rc).·The·README-file·contains |
| 1268 | ···more·information·about·the·correct·prefix. | 1268 | ···more·information·about·the·correct·prefix. |
| 1269 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149187768"></a><a·name="idp149187896"></a><p><b>5.4.</b></p></td><td·align="left"·valign="top"><p> | 1269 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149212344"></a><a·name="idp149212472"></a><p><b>5.4.</b></p></td><td·align="left"·valign="top"><p> |
| 1270 | ···Often·lines·that·are·similar·but·not·identical·appear·next·to·each·other | 1270 | ···Often·lines·that·are·similar·but·not·identical·appear·next·to·each·other |
| 1271 | ···but·sometimes·not.·Why? | 1271 | ···but·sometimes·not.·Why? |
| 1272 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1272 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1273 | ···Lines·where·only·the·amount·of·white·space·characters·is·different | 1273 | ···Lines·where·only·the·amount·of·white·space·characters·is·different |
| 1274 | ···are···treated·as·"equal"·at·first,·while·just·one·different·non-white·character | 1274 | ···are···treated·as·"equal"·at·first,·while·just·one·different·non-white·character |
| 1275 | ···causes·the·lines·to·be·"different".·If·similar·lines·appear·next·to·each | 1275 | ···causes·the·lines·to·be·"different".·If·similar·lines·appear·next·to·each |
| 1276 | ···other,·this·actually·is·coincidence·but·this·fortunately·is·often·the·case. | 1276 | ···other,·this·actually·is·coincidence·but·this·fortunately·is·often·the·case. |
| 1277 | ···See·also·<a·class="link"·href="interpretinginformation.html#manualdiffhelp"·title="Manually·Aligning·Lines">Manual·Diff·Help</a>. | 1277 | ···See·also·<a·class="link"·href="interpretinginformation.html#manualdiffhelp"·title="Manually·Aligning·Lines">Manual·Diff·Help</a>. |
| 1278 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149189304"></a><a·name="idp149189432"></a><p><b>5.5.</b></p></td><td·align="left"·valign="top"><p> | 1278 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149213880"></a><a·name="idp149214008"></a><p><b>5.5.</b></p></td><td·align="left"·valign="top"><p> |
| 1279 | ···Why·must·all·conflicts·be·solved·before·the·merge·result·can·be·saved? | 1279 | ···Why·must·all·conflicts·be·solved·before·the·merge·result·can·be·saved? |
| 1280 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1280 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1281 | ···For·each·equal·or·different·section·the·editor·in·the·merge·result | 1281 | ···For·each·equal·or·different·section·the·editor·in·the·merge·result |
| 1282 | ···window····remembers·where·it·begins·or·ends.·This·is·needed·so·that·conflicts | 1282 | ···window····remembers·where·it·begins·or·ends.·This·is·needed·so·that·conflicts |
| 1283 | ···can··be·solved·manually·by·simply·selecting·the·source·button·(A,·B·or·C). | 1283 | ···can··be·solved·manually·by·simply·selecting·the·source·button·(A,·B·or·C). |
| 1284 | ···This··information·is·lost·while·saving·as·text·and·it·is·too·much·effort·to | 1284 | ···This··information·is·lost·while·saving·as·text·and·it·is·too·much·effort·to |
| 1285 | ···create··a·special·file·format·that·supports·saving·and·restoring·all·necessary | 1285 | ···create··a·special·file·format·that·supports·saving·and·restoring·all·necessary |
| 1286 | ···information. | 1286 | ···information. |
| 1287 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149190328"></a><a·name="idp149190456"></a><p><b>5.6.</b></p></td><td·align="left"·valign="top"><p> | 1287 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149214904"></a><a·name="idp149215032"></a><p><b>5.6.</b></p></td><td·align="left"·valign="top"><p> |
| 1288 | ···How·can·I·synchronise·the·diff·and·merge·views,·so·that·all·views·show·the·same·text·position? | 1288 | ···How·can·I·synchronise·the·diff·and·merge·views,·so·that·all·views·show·the·same·text·position? |
| 1289 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1289 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1290 | ··Click·into·the·summary·column·left·of·the·text.·(<a·class="link"·href="merging.html#synchronise_views"·title="Setting·The·Current·Group·And·Synchronising·Merge·And·Diff·View·Position">See·also·here.</a>) | 1290 | ··Click·into·the·summary·column·left·of·the·text.·(<a·class="link"·href="merging.html#synchronise_views"·title="Setting·The·Current·Group·And·Synchronising·Merge·And·Diff·View·Position">See·also·here.</a>) |
| 1291 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149191864"></a><a·name="idp149191992"></a><p><b>5.7.</b></p></td><td·align="left"·valign="top"><p> | 1291 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149216440"></a><a·name="idp149216568"></a><p><b>5.7.</b></p></td><td·align="left"·valign="top"><p> |
| 1292 | ···Why·does·the·editor·in·the·merge·result·window·not·have·an·"undo"-function? | 1292 | ···Why·does·the·editor·in·the·merge·result·window·not·have·an·"undo"-function? |
| 1293 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1293 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1294 | ··This·was·too·much·effort·until·now.·You·can·always | 1294 | ··This·was·too·much·effort·until·now.·You·can·always |
| 1295 | ··restore·a·version·from·one·source·(A,·B·or·C)·by·clicking·the·respective | 1295 | ··restore·a·version·from·one·source·(A,·B·or·C)·by·clicking·the·respective |
| 1296 | ··button.·For·big·editing·the·use·of·another·editor·is·recommended·anyway. | 1296 | ··button.·For·big·editing·the·use·of·another·editor·is·recommended·anyway. |
| 1297 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149192888"></a><a·name="idp149193016"></a><p><b>5.8.</b></p></td><td·align="left"·valign="top"><p> | 1297 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149217464"></a><a·name="idp149217592"></a><p><b>5.8.</b></p></td><td·align="left"·valign="top"><p> |
| 1298 | ···When·I·removed·some·text,·then·suddenly·"<No·src·line>"·appeared | 1298 | ···When·I·removed·some·text,·then·suddenly·"<No·src·line>"·appeared |
| 1299 | ···and·cannot·be·deleted.·What·does·that·mean·and·how·can·one·remove·this? | 1299 | ···and·cannot·be·deleted.·What·does·that·mean·and·how·can·one·remove·this? |
| 1300 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1300 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1301 | ···For·each·equal·or·different·section·the·editor·in·the·merge·result | 1301 | ···For·each·equal·or·different·section·the·editor·in·the·merge·result |
| 1302 | ···window····remembers·where·it·begins·or·ends.·"<No·src·line>"·means | 1302 | ···window····remembers·where·it·begins·or·ends.·"<No·src·line>"·means |
| 1303 | ···that····there·is·nothing·left·in·a·section,·not·even·a·new·line·character. | 1303 | ···that····there·is·nothing·left·in·a·section,·not·even·a·new·line·character. |
| 1304 | ···This··can·happen·either·while·merging·automatically·or·by·editing.·This·is | 1304 | ···This··can·happen·either·while·merging·automatically·or·by·editing.·This·is |
| 1305 | ···no·problem,···since·this·hint·won't·appear·in·the·saved·file.·If·you·want | 1305 | ···no·problem,···since·this·hint·won't·appear·in·the·saved·file.·If·you·want |
| 1306 | ···the·orignal·source··back·just·select·the·section·(click·on·the·left·summary | 1306 | ···the·orignal·source··back·just·select·the·section·(click·on·the·left·summary |
| 1307 | ···column)·and·then·click·the·source·button·with·the·needed·contents·(A/B·or | 1307 | ···column)·and·then·click·the·source·button·with·the·needed·contents·(A/B·or |
| 1308 | ···C). | 1308 | ···C). |
| 1309 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149193912"></a><a·name="idp149194040"></a><p><b>5.9.</b></p></td><td·align="left"·valign="top"><p> | 1309 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149218488"></a><a·name="idp149218616"></a><p><b>5.9.</b></p></td><td·align="left"·valign="top"><p> |
| 1310 | ···Why·doesn't·<span·class="application">KDiff3</span>·support·syntax-highlighting? | 1310 | ···Why·doesn't·<span·class="application">KDiff3</span>·support·syntax-highlighting? |
| 1311 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1311 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1312 | ···<span·class="application">KDiff3</span>·already·uses·many·colors·for·difference·highlighting.·More | 1312 | ···<span·class="application">KDiff3</span>·already·uses·many·colors·for·difference·highlighting.·More |
| 1313 | ···highlighting····would·be·confusing.·Use·another·editor·for·this. | 1313 | ···highlighting····would·be·confusing.·Use·another·editor·for·this. |
| 1314 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149195704"></a><a·name="idp149195832"></a><p><b>5.10.</b></p></td><td·align="left"·valign="top"><p> | 1314 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149220280"></a><a·name="idp149220408"></a><p><b>5.10.</b></p></td><td·align="left"·valign="top"><p> |
| 1315 | ···Can·I·use·<span·class="application">KDiff3</span>·to·compare·OpenOffice.Org,·Word,·Excel,·PDF-,·<abbr·class="abbrev">etc.</abbr>·files? | 1315 | ···Can·I·use·<span·class="application">KDiff3</span>·to·compare·OpenOffice.Org,·Word,·Excel,·PDF-,·<abbr·class="abbrev">etc.</abbr>·files? |
| 1316 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1316 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1317 | ···Although·<span·class="application">KDiff3</span>·will·analyse·any·kind·of·file·the·result·will·probably | 1317 | ···Although·<span·class="application">KDiff3</span>·will·analyse·any·kind·of·file·the·result·will·probably |
| 1318 | ···not·be·very·satisfactory·for·you. | 1318 | ···not·be·very·satisfactory·for·you. |
| 1319 | </p><p> | 1319 | </p><p> |
| 1320 | ···<span·class="application">KDiff3</span>·was·made·to·compare·pure·text·files.·OpenOffice,·Word,·Excel·etc. | 1320 | ···<span·class="application">KDiff3</span>·was·made·to·compare·pure·text·files.·OpenOffice,·Word,·Excel·etc. |
| 1321 | ···store·much·more·information·in·the·files·(about·fonts,·pictures,·pages, | 1321 | ···store·much·more·information·in·the·files·(about·fonts,·pictures,·pages, |
| Offset 1328, 27 lines modified | Offset 1328, 27 lines modified |
| 1328 | ···<span·class="application">KDiff3</span>·still·might·help·you. | 1328 | ···<span·class="application">KDiff3</span>·still·might·help·you. |
| 1329 | </p><p> | 1329 | </p><p> |
| 1330 | ···The·best·solution·if·you·only·want·to·compare·the·text·(without·embedded· | 1330 | ···The·best·solution·if·you·only·want·to·compare·the·text·(without·embedded· |
| 1331 | ···objects·like·pictures)·is·to·use·"Select·All"·and·"Copy"·in·your·program· | 1331 | ···objects·like·pictures)·is·to·use·"Select·All"·and·"Copy"·in·your·program· |
| 1332 | ···to·copy·the·interesting·text·to·the·clipoard·and·then·in·<span·class="application">KDiff3</span>·paste·the· | 1332 | ···to·copy·the·interesting·text·to·the·clipoard·and·then·in·<span·class="application">KDiff3</span>·paste·the· |
| 1333 | ···text·into·either·diff·input·window.· | 1333 | ···text·into·either·diff·input·window.· |
| 1334 | ···(See·also·<a·class="link"·href="selections.html"·title="Select,·Copy·And·Paste">Select,·Copy·And·Paste</a>.) | 1334 | ···(See·also·<a·class="link"·href="selections.html"·title="Select,·Copy·And·Paste">Select,·Copy·And·Paste</a>.) |
| 1335 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149201336"></a><a·name="idp149201464"></a><p><b>5.11.</b></p></td><td·align="left"·valign="top"><p> | 1335 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149225912"></a><a·name="idp149226040"></a><p><b>5.11.</b></p></td><td·align="left"·valign="top"><p> |
| 1336 | ···Where·has·the·the·directory·option·"List·only·deltas"·gone? | 1336 | ···Where·has·the·the·directory·option·"List·only·deltas"·gone? |
| 1337 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1337 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1338 | ···There·are·now·several·<a·class="link"·href="dirmergevisible.html#selectingvisiblefiles"·title="Selecting·Listed·Files">"Show"-options</a>·in·the·directory·menu. | 1338 | ···There·are·now·several·<a·class="link"·href="dirmergevisible.html#selectingvisiblefiles"·title="Selecting·Listed·Files">"Show"-options</a>·in·the·directory·menu. |
| 1339 | ···Disabling·"Show·identical·files"·will·achieve·what·enabling·"List·only·deltas"·used·to·do. | 1339 | ···Disabling·"Show·identical·files"·will·achieve·what·enabling·"List·only·deltas"·used·to·do. |
| 1340 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149203000"></a><a·name="idp149203128"></a><p><b>5.12.</b></p></td><td·align="left"·valign="top"><p> | 1340 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149227576"></a><a·name="idp149227704"></a><p><b>5.12.</b></p></td><td·align="left"·valign="top"><p> |
| 1341 | ···How·can·I·make·a·big·selection·in·the·diff·input·window | 1341 | ···How·can·I·make·a·big·selection·in·the·diff·input·window |
| 1342 | ···because·scrolling·takes·so·long? | 1342 | ···because·scrolling·takes·so·long? |
| 1343 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1343 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1344 | ···Start·the·selection·as·usual·(click·and·hold·the·left·mouse·button).· | 1344 | ···Start·the·selection·as·usual·(click·and·hold·the·left·mouse·button).· |
| 1345 | ···Then·use·the·navigation·keys·(e.g.·page·up,·page·down)·while·holding·the·left·mouse·button·down. | 1345 | ···Then·use·the·navigation·keys·(e.g.·page·up,·page·down)·while·holding·the·left·mouse·button·down. |
| 1346 | ···(See·also·<a·class="link"·href="selections.html"·title="Select,·Copy·And·Paste">Select,·Copy·And·Paste</a>.) | 1346 | ···(See·also·<a·class="link"·href="selections.html"·title="Select,·Copy·And·Paste">Select,·Copy·And·Paste</a>.) |
| 1347 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149204536"></a><a·name="idp149204664"></a><p><b>5.13.</b></p></td><td·align="left"·valign="top"><p> | 1347 | </p></td></tr><tr·class="question"><td·align="left"·valign="top"><a·name="idp149229112"></a><a·name="idp149229240"></a><p><b>5.13.</b></p></td><td·align="left"·valign="top"><p> |
| 1348 | ···There·is·so·much·information·here,·but·your·question·is·still·not·answered? | 1348 | ···There·is·so·much·information·here,·but·your·question·is·still·not·answered? |
| 1349 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> | 1349 | </p></td></tr><tr·class="answer"><td·align="left"·valign="top"></td><td·align="left"·valign="top"><p> |
| 1350 | ···Please·send·me·your·question.·I·appreciate·every·comment. | 1350 | ···Please·send·me·your·question.·I·appreciate·every·comment. |
| 1351 | </p></td></tr></tbody></table></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="kpart.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="credits.html">Next</a></td></tr><tr><td·class="prevCell">Using·<span·class="application">KDiff3</span>·as·a·KPart </td><td·class="upCell"> </td><td·class="nextCell"> Credits·and·License</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></FILENAME><FILENAME·filename="credits.html"><html><head><title>Chapter 6. Credits·and·License</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/cs·✂ | 1351 | </p></td></tr></tbody></table></div></div></div><div·id="footer"><div·class="navCenter"><table·class="navigation"><tr><td·class="prevCell"><a·accesskey="p"·href="kpart.html">Prev</a></td><td·class="upCell"><a·accesskey="h"·href="index.html">Contents</a></td><td·class="nextCell"><a·accesskey="n"·href="credits.html">Next</a></td></tr><tr><td·class="prevCell">Using·<span·class="application">KDiff3</span>·as·a·KPart </td><td·class="upCell"> </td><td·class="nextCell"> Credits·and·License</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></FILENAME><FILENAME·filename="credits.html"><html><head><title>Chapter 6. Credits·and·License</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/cs·✂ |
| 1352 | <span·class="application">KDiff3</span>·-·File·and·Directory·Comparison·and·Merge·Tool | 1352 | <span·class="application">KDiff3</span>·-·File·and·Directory·Comparison·and·Merge·Tool |
| 1353 | </p><p> | 1353 | </p><p> |
| 1354 | Program·copyright·2002-2007·Joachim·Eibl·<code·class="email">(joachim.eibl·at·gmx.de)</code> | 1354 | Program·copyright·2002-2007·Joachim·Eibl·<code·class="email">(joachim.eibl·at·gmx.de)</code> |