<FILENAME filename="index.html"><html><head><title>The Kompare Handbook</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="description" content="Kompare is a GUI front-end program that enables differences between source files to be viewed and merged. Kompare can be used to compare differences on files or the contents of folders. Kompare supports a variety of diff formats and provide many options to customize the information level displayed."><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> The <span class="application">Kompare</span> Handbook</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="introduction.html">Next</a></td></tr></table></div><div id="contentBody"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="kompare"></a>The <span class="application">Kompare</span> Handbook</h1></div><div><div class="authorgroup"><p class="author"><span class="firstname">Sean</span> <span class="surname">Wheller</span> <code class="email"><sean@inwords.co.za></code></p></div></div><div>Revision <span class="releaseinfo">4.1.3 (Applications 16.04) (<span class="date">2016-07-05</span>)</span></div><div><p class="copyright">Copyright © 2007 Sean Wheller</p></div><div><p><a href="help:/kdoctools5-common/fdl-notice.html">Legal Notice</a></p></div><div><div><div class="abstract"><p> <span class="application">Kompare</span> is a <acronym class="acronym">GUI</acronym> front-end program that enables differences between source files to be viewed and merged. <span class="application">Kompare</span> can be used to compare differences on files or the contents of folders. <span class="application">Kompare</span> supports a variety of diff formats and provide many options to customize the information level displayed.</p></div></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="chapter"><a href="introduction.html">1. Introduction</a></span></dt><dt><span class="chapter"><a href="using.html">2. Using <span class="application">Kompare</span></a></span></dt><dd><dl><dt><span class="sect1"><a href="using.html#getting-started">Getting Started</a></span></dt><dd><dl><dt><span class="sect2"><a href="using.html#starting-kompare">Starting <span class="application">Kompare</span></a></span></dt><dt><span class="sect2"><a href="using.html#main-interface">The Main Interface</a></span></dt></dl></dd><dt><span class="sect1"><a href="viewing-differences.html">Viewing Differences</a></span></dt><dd><dl><dt><span class="sect2"><a href="viewing-differences.html#managing-screen-real-estate">Managing Screen Real-Estate</a></span></dt><dt><span class="sect2"><a href="viewing-differences.html#switching-source-and-destination-view">Switching Source and Destination Views</a></span></dt><dt><span class="sect2"><a href="viewing-differences.html#display-difference-statistics">Displaying Difference Statistics</a></span></dt><dt><span class="sect2"><a href="viewing-differences.html#navigating-the-difference-view">Navigating the Difference View</a></span></dt></dl></dd><dt><span class="sect1"><a href="merging-differences.html">Merging Differences</a></span></dt><dd><dl><dt><span class="sect2"><a href="merging-differences.html#applying-a-difference">Applying a Difference</a></span></dt><dt><span class="sect2"><a href="merging-differences.html#unapplying-a-difference">Unapplying a Difference</a></span></dt><dt><span class="sect2"><a href="merging-differences.html#applying-all-differences">Applying All Differences</a></span></dt><dt><span class="sect2"><a href="merging-differences.html#unapplying-all-differences">Unapplying All Differences</a></span></dt><dt><span class="sect2"><a href="merging-differences.html#saving-changes">Saving Changes</a></span></dt></dl></dd><dt><span class="sect1"><a href="working-with-diff-files.html">Working with Diff Files</a></span></dt><dd><dl><dt><span class="sect2"><a href="working-with-diff-files.html#creating-a-diff">Creating a Diff</a></span></dt><dt><span class="sect2"><a href="working-with-diff-files.html#displaying-a-diff">Displaying a Diff</a></span></dt><dt><span class="sect2"><a href="working-with-diff-files.html#applying-a-diff">Applying Differences in a Diff File</a></span></dt><dt><span class="sect2"><a href="working-with-diff-files.html#blending-a-diff">Blending a <acronym class="acronym">URL</acronym> with a Diff</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="configure-preferences.html">3. Configuring Preferences</a></span></dt><dd><dl><dt><span class="sect1"><a href="configure-preferences.html#view-settings">View Settings</a></span></dt><dd><dl><dt><span class="sect2"><a href="configure-preferences.html#appearance">Appearance</a></span></dt><dt><span class="sect2"><a href="configure-preferences.html#fonts">Fonts</a></span></dt></dl></dd><dt><span class="sect1"><a href="diff-settings.html">Diff Settings</a></span></dt><dd><dl><dt><span class="sect2"><a href="diff-settings.html#diff">Diff</a></span></dt><dt><span class="sect2"><a href="diff-settings.html#diff-format">Format</a></span></dt><dt><span class="sect2"><a href="diff-settings.html#options">Options</a></span></dt><dt><span class="sect2"><a href="diff-settings.html#exclude">Exclude</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="command-reference.html">4. Command Reference</a></span></dt><dd><dl><dt><span class="sect1"><a href="command-reference.html#menu-items">Menu Items</a></span></dt><dd><dl><dt><span class="sect2"><a href="command-reference.html#file-menu">The File Menu</a></span></dt><dt><span class="sect2"><a href="command-reference.html#difference-menu">The Difference Menu</a></span></dt><dt><span class="sect2"><a href="command-reference.html#settingshelpmenu">The Settings and Help Menu</a></span></dt></dl></dd><dt><span class="sect1"><a href="commandline-options.html">Commandline Options</a></span></dt></dl></dd><dt><span class="chapter"><a href="credits.html">5. Credits and License</a></span></dt></dl></div><FILENAME filename="introduction.html"><html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="index.html" title="The Kompare Handbook"><link rel="prev" href="index.html" title="The Kompare Handbook"><link rel="next" href="using.html" title="Chapter 2. Using Kompare"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Introduction</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="index.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="using.html">Next</a></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="introduction"></a>Chapter 1. Introduction</h1></div></div></div><p>When two or more people are working on a file and passing it back and forth between one another, it becomes difficult to see what changes have been made to a new version or copy of the file. Opening the new copy and the original, side-by-side in the application used to create it is one solution but, laborious, time consuming, and prone to error. This is where a program to show differences, diffs for short, is useful.</p><p>As would be expected, an appropriate name for such a program would be <span class="quote">“<span class="quote">diff</span>”</span>. As it happens, the program <a class="ulink" href="https://www.gnu.org/software/diffutils/" target="_top">diff</a> is installed on most <span class="trademark">Linux</span>®-based systems and is used for exactly this purpose. Developers often use diff, as a command line tool, to show differences between versions of a source code file. However, the use of diff is not limited to showing differences in code source files, it can be used on many text-based file types.</p><p>Using diff from the command line can be confusing, learning the diff command syntax and deciphering the output can bewilder most people. This is where <span class="application">Kompare</span> comes into play. Providing a graphical front-end to the diff program, the interface displays source and destination files side-by-side with all differences automatically highlighted. From this starting point, changes in one file can be sequentially applied to the other file on a selective and controlled basis. Not all changes need to be applied and if you do apply a change it can always be 'unapplied'. When all required changes have been applied they can be saved and will display as normal in the original application used to create the file.</p><p>In addition to displaying differences between a source and destination file, <span class="application">Kompare</span> can be used to create and view a special file called a 'diff'. This file captures the differences between the two sources into a single file that can be used to view and apply changes to any other copy of the file. For example, if two people are editing a document. The first person wants to make changes and send just the changes made to the second person. Normally, the first person would send a complete copy of the modified document to the second person, who would then have to compare the modified document side-by-side with unmodified version. The process for this is much like what we have described in the previous paragraphs. With <span class="application">Kompare</span> the first person would first make a local copy of the file to be modified, then make changes and compare the original and modified copy. Now using <span class="application">Kompare</span> a diff file can be created that captures only the changes made. This can be sent to the second person in place of a whole file containing the changes.</p><p>Using <span class="application">Kompare</span> the second person can view the diff file, compare it to the local copy of the document and apply the changes made by the first person. So the process can go on for many versions of the document, each person making changes, creating diffs, distributing them and applying them. This process is commonly called <span class="quote">“<span class="quote">patching</span>”</span> , a term taken from the program named <span class="quote">“<span class="quote">patch</span>”</span> which is another command line tool specifically designed for the purpose of applying diff files.</p><p>It sometimes happens that people edit a file at the same time. In this situation it is likely that people will make changes in the document at exactly the same line. This creates a problem because, without applied caution, people could be overwriting each others work as they apply the diff files they receive. Fortunately the developers of the diff and patch programs took this into consideration and so these tools will not allow such changes to be applied without manual intervention. When this state is reached, it is known as a <span class="quote">“<span class="quote">conflict</span>”</span> . <span class="application">Kompare</span> will display conflicts so that you can manually resolve them, deciding which changes should be applied to which file.</p><p><span class="application">Kompare</span> is also a great program for comparison of file changes on a folder level. When used to compare folders <span class="application">Kompare</span> recursively examines subfolders and their file contents for differences. In this use case, each file where differences are found are automatically opened and listed by <span class="application">Kompare</span> where easy navigation between the various files is possible.</p></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="index.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="using.html">Next</a></td></tr><tr><td class="prevCell">The <span class="application">Kompare</span> Handbook </td><td class="upCell"> </td><td class="nextCell"> Using <span class="application">Kompare</span></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="using.html"><html><head><title>Chapter 2. Using Kompare</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="index.html" title="The Kompare Handbook"><link rel="prev" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="viewing-differences.html" title="Viewing Differences"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Using <span class="application">Kompare</span></div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="introduction.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="viewing-differences.html">Next</a></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="using"></a>Chapter 2. Using <span class="application">Kompare</span></h1></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="getting-started"></a>Getting Started</h2></div></div></div><p>This section provides instructions for starting <span class="application">Kompare</span> and provides a quick tour to the <span class="application">Kompare</span> main interface.</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="starting-kompare"></a>Starting <span class="application">Kompare</span></h3></div></div></div><p>A shortcut for starting <span class="application">Kompare</span> can be found in the application menu in the Development group <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Development</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Kompare</span></span>.</p><p>When <span class="application">Kompare</span> starts the first thing it does is display a dialog from which to select the files you wish to compare. Special settings for the properties of the diff and the appearance thereof can also be selected. In the file form select a source and destination source to compare. This can be any two files, folders or a <acronym class="acronym">URL</acronym> and a file. Once the source and destination are selected click the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guibutton">Compare</span></span> button.</p><p>Once <span class="application">Kompare</span> has discovered the differences it will display the main interface. When comparing two files or a URL and a file the process takes just a few seconds. However, when comparing folders with many subfolders and files, this process can take awhile.</p><p>For explanation of the options available from diff and appearance forms see <a class="xref" href="configure-preferences.html" title="Chapter 3. Configuring Preferences">Chapter 3, <i>Configuring Preferences</i></a>.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="main-interface"></a>The Main Interface</h3></div></div></div><p>This section provides a quick tour of the main interface which is comprised of the following areas:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Menus</p></li><li class="listitem"><p>Toolbar</p></li><li class="listitem"><p>Source and Destination Folders</p></li><li class="listitem"><p>Source and Destination Files</p></li><li class="listitem"><p>Source and Destination Line Changes</p></li><li class="listitem"><p>Source and Destination Text View</p></li><li class="listitem"><p>Statusbar</p></li></ul></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="menus"></a>Menus</h4></div></div></div><p><span class="application">Kompare</span> provides a menu driven interface. Explanation to the menu items and their options is provided in <a class="xref" href="command-reference.html" title="Chapter 4. Command Reference">Chapter 4, <i>Command Reference</i></a>.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="toolbar"></a>Toolbar</h4></div></div></div><p>The <span class="application">Kompare</span> toolbar provides shortcuts to the most frequently used diff and merge operations. The toolbar orientation, text positioning, icon size properties and which shortcut icons are displayed can be customized from the toolbar context menu accessed when right-clicking the toolbar with the mouse. The toolbar context menu also enables the toolbar to be hidden. If the toolbar is hidden and you wish to unhide it, select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Settings</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Show Toolbar</span></span>.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="source-destination-folders"></a>Source and Destination Folders</h4></div></div></div><p>The source folder and destination folder panes display the folders in which compared files reside. When many subfolders are included in the comparison, then selecting a folder will display the first document in that folder where a difference was found between the source and destination.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="source-destination-files"></a>Source and Destination Files</h4></div></div></div><p>The source and destination file pane displays files where a difference was found for the currently selected source or destination folder. When a folder has multiple documents containing differences, all documents with a difference are listed. The selected document is displayed.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="source-destination-lines"></a>Source and Destination Line Changes</h4></div></div></div><p>The source and destination line changes pane summarizes the differences found between the current source and destination documents. Selecting a record within the pane highlights and selects the difference. This is a useful way to navigate and inspect long documents with many differences.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="source-destination-view"></a>Source and Destination View</h4></div></div></div><p>The source and destination view is the main workspace of <span class="application">Kompare</span>. The contents and highlighted differences of the currently selected source and destination file are displayed here with line numbers.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="text-view"></a>Text View</h4></div></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Text View</span></span> is not displayed by default. It can be opened by selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Settings</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Show Text View</span></span>.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="statusbar"></a>Statusbar</h4></div></div></div><p>The status bar provides a summary of the current source and destination file or folder under comparison. The status bar also reports the number of changes found in the current document and counts the differences that have been applied. Furthermore, the status bar shows the overall number of documents containing differences and the current document number selected from this set. For example, a comparison run over two folders may return 1890 files with differences. The currently selected document is number 18 of 1890.</p></div></div></div><FILENAME filename="viewing-differences.html"><html><head><title>Viewing Differences</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="using.html" title="Chapter 2. Using Kompare"><link rel="prev" href="using.html" title="Chapter 2. Using Kompare"><link rel="next" href="merging-differences.html" title="Merging Differences"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Viewing Differences</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="using.html">Prev</a></td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"><a accesskey="n" href="merging-differences.html">Next</a></td></tr></table></div><div id="contentBody"><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="viewing-differences"></a>Viewing Differences</h2></div></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="managing-screen-real-estate"></a>Managing Screen Real-Estate</h3></div></div></div><p><span class="application">Kompare</span> displays the source and destination file under using equal percentage of the main interface view work area. This view area provides some features that help optimize use of screen real-estate while viewing differences, including:</p><div class="variablelist"><dl class="variablelist"><dt><span class="term">Dual Scrollbars</span></dt><dd><p>The most obvious feature is that scrollbars are provided both on the right and bottom edges of the view area. Using the scrollbars it is possible to move rapidly through the comparison.</p></dd><dt><span class="term">Share Grip Handle</span></dt><dd><p>The vertical space between the source and destination view not only makes it possible to clearly see the start and end of lines in each of the panes, but is also a grip handle that allows adjustment of percentage occupied between the source and destinate views that comprise the view pane. To change pane size for one of the views, hover the mouse pointer over the grip handle then hold down the mouse button and drag left or right. Naturally, increasing the area of one pane will decrease the area available to the opposite pane within the view panel area.</p><p>A second horizontal handle is available between the navigation panel and the source and destination view.</p></dd><dt><span class="term">Docking</span></dt><dd><p>The navigation panel can be undocked from the main interface by clicking the <span class="inlinemediaobject"><img src="undock.png"></span> icon located top right of the panel. This opens it in a window of its own, allowing you to move it across the screen. You can even hide the navigation panel by clicking the <span class="inlinemediaobject"><img src="dock.png"></span> icon. To display a hidden navigation bar again, click with the <span class="mousebutton">right</span> mouse button into the menubar and select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Navigation</span></span> from the context menu. </p></dd><dt><span class="term">Statusbar Toggle</span></dt><dd><p>The status bar of the view panel can be toggled on and off by selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Settings</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Show Statusbar</span></span>.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="switching-source-and-destination-view"></a>Switching Source and Destination Views</h3></div></div></div><p>Sometimes it can be useful to consider what the file to which differences where to be applied as the source. For example, when comparing two modified versions of a file and discovering that the one file has many more modifications that the other. The file with more changed would be better as the source, since then fewer differences would need to be applied.</p><p>In this case select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Swap Source with Destination</span></span>. This will switch the files displayed in all <span class="application">Kompare</span> panels.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="display-difference-statistics"></a>Displaying Difference Statistics</h3></div></div></div><p>For a quick overview of the differences, select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Show Statistics</span></span>. This will display the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff Statistics</span></span> dialog. The following information is provided:</p><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Old file:</span></span></span></dt><dd><p>The file name of what is usually the source file or file that is unmodified.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">New file:</span></span></span></dt><dd><p>The file name of what is usually the destination file or file that is modified and to which differences will be applied.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Format:</span></span></span></dt><dd><p>The diff format used to display the difference (see <a class="xref" href="diff-settings.html#diff-format" title="Format">the section called “Format”</a>).</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Number of hunks:</span></span></span></dt><dd><p>The number of hunks found in the difference.</p><p>A hunk is a <span class="quote">“<span class="quote">c<span class="emphasis"><em>hunk</em></span></span>”</span> of lines that have been marked as different between source and destination and may include context lines depending on the diff format <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Lines of Context</span></span> value (see <a class="xref" href="diff-settings.html#diff-format" title="Format">the section called “Format”</a>).</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Number of differences</span></span></span></dt><dd><p>The actual number of differences found, not hunks. A hunk can contain one or more differences when the line change range and the context lines of any two or more changes overlap.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="navigating-the-difference-view"></a>Navigating the Difference View</h3></div></div></div><p><span class="application">Kompare</span> enables rapid navigation of differences on a file level and of multiple difference files when comparing folder trees.</p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="selecting-a-difference"></a>Selecting a Difference</h4></div></div></div><p>A difference can be selected using by:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>clicking a line in the Source and Destination Line Changes pane (top right of the main window).</p></li><li class="listitem"><p>clicking the highlighted difference in the View pane.</p></li><li class="listitem"><p>traversing the listed differences in a comparison (see <a class="xref" href="viewing-differences.html#traversing-differences" title="Traversing Differences">the section called “Traversing Differences”</a>).</p></li></ul></div><p>When a difference is selected it is considered to be <span class="quote">“<span class="quote">in focus</span>”</span> and is displayed in a brighter color that non-selected differences.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="traversing-differences"></a>Traversing Differences</h4></div></div></div><p>When a comparison finds many differences one of the best ways to approach reviewing them is to traverse the differences in a logical order, usually from top to bottom.</p><p>By default <span class="application">Kompare</span> selects the first difference found in a comparison. By selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Next Difference</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Down</strong></span>) the difference following the current selection is brought into focus. To select the difference before the current difference select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Previous Difference</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Up</strong></span>).</p><p>In this way it is possible to traverse differences in an orderly manner, applying and unapply differences upon review.</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a name="switching-between-files"></a>Switching Between Files</h4></div></div></div><p>When a comparison is performed on folder level, many files may be found with differences. A complete list of the files compared with difference found is provided in the <span class="quote">“<span class="quote">Source and Destination Folders</span>”</span>, and <span class="quote">“<span class="quote">Source and Destination Files</span>”</span> panes. However, <span class="application">Kompare</span> displays differences between source and destination one comparison at time.</p><p>To switch between documents in this scenario the following options are available:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Select the <span class="quote">“<span class="quote">Source and Destination Folders</span>”</span> pane to display file differences found in the <span class="quote">“<span class="quote">Source and Destination Files</span>”</span> pane, then select a file.</p></li><li class="listitem"><p>Select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Previous File</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>PgUp</strong></span>) or <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Next File</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>PgDown</strong></span>) to display the previous or next difference file found in the <span class="quote">“<span class="quote">Source and Destination Files</span>”</span> pane.</p></li></ul></div></div></div></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="using.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="merging-differences.html">Next</a></td></tr><tr><td class="prevCell">Using <span class="application">Kompare</span> </td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"> Merging Differences</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="merging-differences.html"><html><head><title>Merging Differences</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="using.html" title="Chapter 2. Using Kompare"><link rel="prev" href="viewing-differences.html" title="Viewing Differences"><link rel="next" href="working-with-diff-files.html" title="Working with Diff Files"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Merging Differences</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="viewing-differences.html">Prev</a></td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"><a accesskey="n" href="working-with-diff-files.html">Next</a></td></tr></table></div><div id="contentBody"><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="merging-differences"></a>Merging Differences</h2></div></div></div><p><span class="application">Kompare</span> makes the task of applying and unapplying differences as simple as point and click. Multiple apply and unapply operations can be performed on a difference as all operations are performed in memory and not written to the files on disk until the save operation is performed.</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="applying-a-difference"></a>Applying a Difference</h3></div></div></div><p>To apply a difference, click the highlighted difference region, then select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Apply Difference</span></span> (<span class="keycap"><strong>Space</strong></span>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="unapplying-a-difference"></a>Unapplying a Difference</h3></div></div></div><p>To unapply a difference, click the highlighted difference region previously applied, then select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Unapply Difference</span></span> (<span class="keysym">Backspace</span>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="applying-all-differences"></a>Applying All Differences</h3></div></div></div><p>After reviewing differences between files and finding all acceptable it is possible apply them all with a single operation by selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Apply All</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>A</strong></span>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="unapplying-all-differences"></a>Unapplying All Differences</h3></div></div></div><p>To revert all differences that have been applied previously select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Unapply All</span></span> (<span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>U</strong></span>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="saving-changes"></a>Saving Changes</h3></div></div></div><p>Once differences have been applied they can be saved by selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save</span></span> or <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save All</span></span>.</p><p>Applied differences are saved to both the source and destination file.</p></div></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="viewing-differences.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="working-with-diff-files.html">Next</a></td></tr><tr><td class="prevCell">Viewing Differences </td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"> Working with Diff Files</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="working-with-diff-files.html"><html><head><title>Working with Diff Files</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="using.html" title="Chapter 2. Using Kompare"><link rel="prev" href="merging-differences.html" title="Merging Differences"><link rel="next" href="configure-preferences.html" title="Chapter 3. Configuring Preferences"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Working with Diff Files</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="merging-differences.html">Prev</a></td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"><a accesskey="n" href="configure-preferences.html">Next</a></td></tr></table></div><div id="contentBody"><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="working-with-diff-files"></a>Working with Diff Files</h2></div></div></div><p>Diff files contain only the changes made between files, or a set of files within a folder system, and may or may not contain a number of context lines before and after line changes. The sum of a line change and its context lines is known a hunk. A diff file therefore may contain multiple hunks from one or more files. When the context lines of two or more hunks overlap, they are considered a single hunk. Diff files can be used to:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>Apply the changes contained in the hunks to an original file.</p></li><li class="listitem"><p>Apply the changes contained in the hunks to a file or set of original files within a folder system.</p></li><li class="listitem"><p>Modified before being applied to an original file or set of original files within a folder system.</p></li></ul></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="creating-a-diff"></a>Creating a Diff</h3></div></div></div><p>To create a diff file a comparison must be displayed in <span class="application">Kompare</span>. Assuming this is the case, then select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save Diff...</span></span> This will display the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff Options</span></span> dialog (see <a class="xref" href="diff-settings.html" title="Diff Settings">the section called “Diff Settings”</a> for more information on diff formats and options). After configuring these options, click the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guibutton">Save</span></span> button and save the diff to a file with the extension <code class="filename">.diff</code>.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="displaying-a-diff"></a>Displaying a Diff</h3></div></div></div><p>It is possible to display the contents of a diff file within <span class="application">Kompare</span> by opening the diff file from <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Open Diff...</span></span>.</p><p>When viewing a diff file the hunks between the source and destination file are shown, remember that only the hunks are shown, no unmodified lines will be shown. In some cases a diff file is created with 0 lines of context. In this case only the changed lines will be displayed.</p><p>When a diff file contains hunks from multiple files <span class="application">Kompare</span> displays the hunks from each file one at a time and you can switch between files as though they were real files even though this information is only provided by the diff file contents.</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="applying-a-diff"></a>Applying Differences in a Diff File</h3></div></div></div><p>When viewing differences in a diff file it is possible to apply difference as you would when comparing source and destination files (see <a class="xref" href="merging-differences.html" title="Merging Differences">the section called “Merging Differences”</a>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="blending-a-diff"></a>Blending a <acronym class="acronym">URL</acronym> with a Diff</h3></div></div></div><p>In cases where a diff file is provided it is possible to compare the hunks in the diff against a file or folder. To do this select <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Blend URL with Diff...</span></span>. Then input the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">File/Folder</span></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff Output</span></span> paths.</p><p>When viewing differences between a source file and a diff file it is possible to apply difference as you would when comparing source and destination files (see <a class="xref" href="merging-differences.html" title="Merging Differences">the section called “Merging Differences”</a>).</p></div></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="merging-differences.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="configure-preferences.html">Next</a></td></tr><tr><td class="prevCell">Merging Differences </td><td class="upCell">Using <span class="application">Kompare</span></td><td class="nextCell"> Configuring Preferences</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="introduction.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="viewing-differences.html">Next</a></td></tr><tr><td class="prevCell">Introduction </td><td class="upCell"> </td><td class="nextCell"> Viewing Differences</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="configure-preferences.html"><html><head><title>Chapter 3. Configuring Preferences</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="index.html" title="The Kompare Handbook"><link rel="prev" href="working-with-diff-files.html" title="Working with Diff Files"><link rel="next" href="diff-settings.html" title="Diff Settings"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Configuring Preferences</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="working-with-diff-files.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="diff-settings.html">Next</a></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="configure-preferences"></a>Chapter 3. Configuring Preferences</h1></div></div></div><p><span class="application">Kompare</span> enables users to set appearance preferences for difference formatting in the main interface and set behavioral properties of the diff program. The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Preferences</span></span> dialog can be accessed by selecting <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Settings</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guisubmenu">Configure <span class="application">Kompare</span>...</span></span>.</p><p>To configure preferences for appearance select the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">View</span></span> menu item (see <a class="xref" href="configure-preferences.html#view-settings" title="View Settings">the section called “View Settings”</a>).</p><p>To configure preferences for diff program properties select the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff</span></span> menu item (see <a class="xref" href="diff-settings.html" title="Diff Settings">the section called “Diff Settings”</a>).</p><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="view-settings"></a>View Settings</h2></div></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">View</span></span> page in the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Preferences</span></span> dialog displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Appearance</span></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Fonts</span></span> tabbed forms.</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="appearance"></a>Appearance</h3></div></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Appearance</span></span> form provides controls to manage the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Colors</span></span> used to denote difference in the main interface, behavior of the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Mouse Wheel</span></span> when jogging up and down and how <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Tabs to Spaces</span></span> conversion is managed.</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-view1.png" alt="Kompare Appearance Settings"></div></div><div class="variablelist"><p class="title"><b>Color Group</b></p><p>To adjust color preferences used when displaying differences, click the color button to display the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Select Color</span></span> dialog for the following states:</p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Removed color</span></span></span></dt><dd><p>Lines that have been removed, do not exist, between source and destination.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Changed color</span></span></span></dt><dd><p>Lines that have been changed, modified, between source and destination. </p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Added color</span></span></span></dt><dd><p>Lines that have been added between source and destination.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Applied color</span></span></span></dt><dd><p>Any of the above states where the difference has been applied between source and destination.</p></dd></dl></div><div class="variablelist"><p class="title"><b>Mouse Wheel</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Number of lines</span></span></span></dt><dd><p>The number of lines to jog the differences when turning the mouse wheel forward or backward.</p></dd></dl></div><div class="variablelist"><p class="title"><b>Tabs to Spaces</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Number of spaces to convert a tab character to</span></span></span></dt><dd><p>Convert each tab character to n space characters.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="fonts"></a>Fonts</h3></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-view2.png" alt="Kompare Fonts Settings"></div></div><p>Select the font family and size to display when displaying differences.</p></div></div><FILENAME filename="diff-settings.html"><html><head><title>Diff Settings</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="configure-preferences.html" title="Chapter 3. Configuring Preferences"><link rel="prev" href="configure-preferences.html" title="Chapter 3. Configuring Preferences"><link rel="next" href="command-reference.html" title="Chapter 4. Command Reference"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Diff Settings</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="configure-preferences.html">Prev</a></td><td class="upCell">Configuring Preferences</td><td class="nextCell"><a accesskey="n" href="command-reference.html">Next</a></td></tr></table></div><div id="contentBody"><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="diff-settings"></a>Diff Settings</h2></div></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Diff</span></span> page in the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Preferences</span></span> dialog displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff</span></span>, <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Format</span></span>, <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Options</span></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Exclude</span></span> tabbed forms. These forms can be used to configure the behavioral properties of the Diff program.</p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="diff"></a>Diff</h3></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-diff1.png" alt="Kompare Diff Settings"></div></div><p>The command used to run the diff program (default <span class="application">diff</span>).</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="diff-format"></a>Format</h3></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-diff2.png" alt="Kompare Format Settings"></div></div><p>Adjust options for the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Output Format</span></span> and number of <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Lines of Context</span></span>.</p><div class="variablelist"><p class="title"><b>Output Format</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Context</span></span></span></dt><dd><p>The context output format adds several lines of context around the lines that differ.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Normal</span></span></span></dt><dd><p>The normal output format displays differing lines without any surrounding lines of context. </p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Unified</span></span></span></dt><dd><p>The unified output format is a variation on the context format. It is considered better than context because the output is more compact than that of context as it omits redundant context lines.</p></dd></dl></div><div class="variablelist"><p class="title"><b>Lines of Context</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Number of context lines</span></span></span></dt><dd><p>When performing a diff with context or unified output format use this parameter to control the number of context lines included.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="options"></a>Options</h3></div></div></div><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-diff3.png" alt="Kompare Options Settings"></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Options</span></span> tab form allows configuration of the options supported by the diff program.</p><div class="variablelist"><p class="title"><b>General</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Treat new files as empty</span></span></span></dt><dd><p>With this option enabled diff will treat a file that only exists in one of the directories as empty in the other directory. This means that the file is compared with an empty file and because of this will appear as one big insertion or deletion.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Look for smaller changes</span></span></span></dt><dd><p>Forces diff to display changes in case, punctuation, space, <abbr class="abbrev">etc.</abbr> when checked.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Optimize for large files</span></span></span></dt><dd><p>Switches diff to process files with high-speed when checked.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore changes in case</span></span></span></dt><dd><p>Lower and Uppercase character changes are omitted when this option is checked.</p></dd></dl></div><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore regexp</span></span></span></dt><dd><p>Ignore lines matching a regular expression.</p></dd></dl></div><div class="variablelist"><p class="title"><b>Whitespace</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Expand tabs to spaces in output</span></span></span></dt><dd><p>When checked diff outputs will converts tab characters to the number of spaces defined in the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Preferences</span></span> dialog <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">View</span></span> menu <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Tabs to Spaces</span></span> option.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore added or removed empty lines</span></span></span></dt><dd><p>lines of zero length that differ between source and destination are ignored when this option is checked.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore changes in the amount of whitespace</span></span></span></dt><dd><p>White space before, after and between lines may change depending on different editors. When this option is checked such changes are ignored.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore all whitespace</span></span></span></dt><dd><p>when checked white space differences are completely ignored.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Ignore changes due to tab expansion</span></span></span></dt><dd><p>when checked white space resulting from tab characters is ignored.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="exclude"></a>Exclude</h3></div></div></div><p>The <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Exclude</span></span> form enables use of the filter options provided by the diff program.</p><div class="screenshot"><div xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="mediaobject"><img src="settings-diff4.png" alt="Kompare Exclude Settings"></div></div><div class="variablelist"><p class="title"><b>File Pattern to Exclude</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">File Pattern to Exclude</span></span></span></dt><dd><p>Exclude files based on wild card filtering</p></dd></dl></div><div class="variablelist"><p class="title"><b>File with Filenames to Exclude</b></p><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">File with Filenames to Exclude</span></span></span></dt><dd><p>Define the filter based on the content of an externally managed file.</p></dd></dl></div></div></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="configure-preferences.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="command-reference.html">Next</a></td></tr><tr><td class="prevCell">Configuring Preferences </td><td class="upCell">Configuring Preferences</td><td class="nextCell"> Command Reference</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="working-with-diff-files.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="diff-settings.html">Next</a></td></tr><tr><td class="prevCell">Working with Diff Files </td><td class="upCell"> </td><td class="nextCell"> Diff Settings</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="command-reference.html"><html><head><title>Chapter 4. Command Reference</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="index.html" title="The Kompare Handbook"><link rel="prev" href="diff-settings.html" title="Diff Settings"><link rel="next" href="commandline-options.html" title="Commandline Options"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Command Reference</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="diff-settings.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="commandline-options.html">Next</a></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="command-reference"></a>Chapter 4. Command Reference</h1></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="menu-items"></a>Menu Items</h2></div></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="file-menu"></a>The File Menu</h3></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Open Diff...</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>O</strong></span></strong></span>)</span></dt><dd><p>Displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Open</span></span> dialog.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Compare Files...</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>C</strong></span></strong></span>)</span></dt><dd><p>Displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Compare Files or Folders</span></span> dialog.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Blend URL with Diff...</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>B</strong></span></strong></span>)</span></dt><dd><p>Displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Blend File/Folder with diff Output</span></span> dialog.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>S</strong></span></strong></span>)</span></dt><dd><p>Writes applied differences to current source and or destination file.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save All</span></span></span></dt><dd><p>Writes applied differences to all source and or destination files.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Save Diff...</span></span></span></dt><dd><p>Displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Diff Options</span></span> dialog to define diff format and options.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Refresh Diff</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>F5</strong></span></strong></span>)</span></dt><dd><p>Updates the difference of the original paths. Useful if you have applied some changes, saved them and want to see what is left.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Swap Source with Destination</span></span></span></dt><dd><p>Changes source and destination.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Show Statistics</span></span></span></dt><dd><p>Displays the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guilabel">Display Statistics</span></span> dialog.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">File</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Quit</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Q</strong></span></strong></span>)</span></dt><dd><p>Exits <span class="application">Kompare</span>.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="difference-menu"></a>The Difference Menu</h3></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Unapply All</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>U</strong></span></strong></span>)</span></dt><dd><p>Unapply all differences previously applied between source and destination.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Unapply Difference</span></span> (<span class="shortcut"><strong><span class="keysym">Backspace</span></strong></span>)</span></dt><dd><p>Revert a selected difference previously applied.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Apply Difference</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Space</strong></span></strong></span>)</span></dt><dd><p>Apply a selected difference.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Apply All</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>A</strong></span></strong></span>)</span></dt><dd><p>Apply all differences between source and destination.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Previous File</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>PgUp</strong></span></strong></span>)</span></dt><dd><p>Make the previous difference, in the list of differences, the current file in the view pane.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Next File</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>PgDown</strong></span></strong></span>)</span></dt><dd><p>Make the next difference, in the list of differences, the current file in the view pane.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Previous Difference</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Up</strong></span></strong></span>)</span></dt><dd><p>Select the difference above the currently selected difference.</p></dd><dt><span class="term"><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Difference</span></span> → <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenuitem">Next Difference</span></span> (<span class="shortcut"><strong><span class="keycap"><strong>Ctrl</strong></span>+<span class="keycap"><strong>Down</strong></span></strong></span>)</span></dt><dd><p>Select the difference below the currently selected difference.</p></dd></dl></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a name="settingshelpmenu"></a>The Settings and Help Menu</h3></div></div></div><p> <span class="application">Kompare</span> has the common <span class="orgname">KDE</span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Settings</span></span> and <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="guiitem"><span class="guimenu">Help</span></span> menu items, for more information read the sections about the <a class="ulink" href="help:/fundamentals/menus.html#menus-settings" target="_top">Settings Menu</a> and <a class="ulink" href="help:/fundamentals/menus.html#menus-help" target="_top">Help Menu</a> of the <span class="orgname">KDE</span> Fundamentals. </p></div></div><FILENAME filename="commandline-options.html"><html><head><title>Commandline Options</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="command-reference.html" title="Chapter 4. Command Reference"><link rel="prev" href="command-reference.html" title="Chapter 4. Command Reference"><link rel="next" href="credits.html" title="Chapter 5. Credits and License"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Commandline Options</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="command-reference.html">Prev</a></td><td class="upCell">Command Reference</td><td class="nextCell"><a accesskey="n" href="credits.html">Next</a></td></tr></table></div><div id="contentBody"><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="commandline-options"></a>Commandline Options</h2></div></div></div><div class="variablelist"><dl class="variablelist"><dt><span class="term">-c</span></dt><dd><p>This will compare URL1 with URL2.</p></dd><dt><span class="term"><strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>kompare</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-o</code></span></code></strong></span></dt><dd><p>This will open URL1 and expect it to be diff output. URL1 can also be a '-' and then it will read from standard input. Can be used for instance for <strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>cvs diff | kompare -o -</strong></span></span></code></strong>. Kompare will do a check to see if it can find the original file(s) and then blend the original file(s) into the diffoutput and show that in the viewer. <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-n</code></span> disables the check.</p></dd><dt><span class="term"><strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>kompare</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-b</code></span></code></strong></span></dt><dd><p>This will blend URL2 into URL1, URL2 is expected to be diff output and URL1 the file or folder that the diffoutput needs to be blended into.</p></dd><dt><span class="term"><strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>kompare</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-n</code></span></code></strong></span></dt><dd><p>Disables the check for automatically finding the original file(s) when using '-' as URL with the <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-o</code></span> option.</p></dd><dt><span class="term"><strong class="userinput"><code><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span class="command"><strong>kompare</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="option"><code class="option">-e</code></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>encoding</code></em></span></code></strong></span></dt><dd><p>Use this to specify the encoding when calling it from the command line. It will default to the local encoding if not specified.</p></dd></dl></div></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="command-reference.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">Command Reference </td><td class="upCell">Command Reference</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></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="diff-settings.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"><a accesskey="n" href="commandline-options.html">Next</a></td></tr><tr><td class="prevCell">Diff Settings </td><td class="upCell"> </td><td class="nextCell"> Commandline 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="credits.html"><html><head><title>Chapter 5. Credits and License</title><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/kdoctools5-common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"><meta name="keywords" content="KDE, Kompare, Diff, Merge, Patch, Hunk"><link rel="home" href="index.html" title="The Kompare Handbook"><link rel="up" href="index.html" title="The Kompare Handbook"><link rel="prev" href="commandline-options.html" title="Commandline Options"><meta http-equiv="Content-Type" content="text/html; charset=utf-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/kdoctools5-common/top-kde.jpg" width="36" height="34"> Credits and License</div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="commandline-options.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="credits"></a>Chapter 5. Credits and License</h1></div></div></div><p> <span class="application">Kompare</span> </p><p> Program copyright 2001-2004, <span class="firstname">John</span> <span class="surname">Firebaugh</span> <code class="email">(jfirebaugh AT kde.org)</code> and Otto Bruggeman <code class="email">(otto.bruggeman AT home.nl)</code> </p><p> Documentation Copyright (c) 2007 Sean Wheller <code class="email">(sean AT inwords.co.za)</code> </p><p><a name="gnu-fdl"></a>This documentation is licensed under the terms of the <a class="ulink" href="help:/kdoctools5-common/fdl-license.html" target="_top">GNU Free Documentation License</a>.</p><p>This program is licensed under the terms of the <a class="ulink" href="help:/kdoctools5-common/gpl-license.html" target="_top">GNU General Public License</a>.</p></div></div><div id="footer"><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="commandline-options.html">Prev</a></td><td class="upCell"><a accesskey="h" href="index.html">Contents</a></td><td class="nextCell"></td></tr><tr><td class="prevCell">Commandline Options </td><td class="upCell"> </td><td class="nextCell"> </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"></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="introduction.html">Next</a></td></tr><tr><td class="prevCell"> </td><td class="upCell"> </td><td class="nextCell"> Introduction</td></tr></table></div><div id="footer_text">Would you like to make a comment or contribute an update to this page?<br>Send feedback to the <a href="mailto:kde-doc-english@kde.org" class="footer_email">KDE Docs Team</a></div></div></div></body></html></FILENAME>
Generated by dwww version 1.15 on Fri Jun 21 07:47:53 CEST 2024.