/usr/share/doc/kdiff3-doc/html/dirmerge.html is in kdiff3-doc 0.9.98-2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | <html><head><title>Chapter 3. Directory Comparison and Merge with KDiff3</title><link rel="stylesheet" type="text/css" href="help:/common/kde-default.css"><link rel="stylesheet" type="text/css" href="help:/common/kde-docs.css"><link rel="stylesheet" type="text/css" href="help:/common/kde-localised.css"><meta name="generator" content="DocBook XSL Stylesheets V1.79.1"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, kio, networktransparent, editor, white space, comments"><link rel="home" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="index.html" title="The KDiff3 Handbook"><link rel="prev" href="preprocessors.html" title="Preprocessor Commands"><link rel="next" href="startingdirmerge.html" title="Starting Directory Comparison Or Merge"><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.14 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div id="content"><div id="header"><div id="header_content"><div id="header_left"><div id="header_right"><img src="help:/common/top-kde.jpg" width="36" height="34"> Directory Comparison and Merge with <span class="application">KDiff3</span></div></div></div></div><div class="navCenter"><table class="navigation"><tr><td class="prevCell"><a accesskey="p" href="preprocessors.html">Prev</a></td><td class="upCell"> </td><td class="nextCell"><a accesskey="n" href="startingdirmerge.html">Next</a></td></tr></table></div><div id="contentBody"><div class="chapter"><div class="titlepage"><div><div><h1 class="title"><a name="dirmerge"></a>Chapter 3. Directory Comparison and Merge with <span class="application">KDiff3</span></h1></div></div></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="dirmergeintro"></a>Introduction into Directory Comparison and Merge</h2></div></div></div><p>
Often programmers must modify many files in a directory to achieve their
purpose. For this <span class="application">KDiff3</span> also lets you compare and merge complete directories
recursively!
</p><p>
Even though comparing and merging directories seems to be quite obvious,
there are several details that you should know about. Most important is of
course the fact that now many files might be affected by each operation.
If you don't have backups of your original data, then it can be very hard
or even impossible to return to the original state. So before starting a merge,
make sure that your data is safe, and going back is possible. If you make
an archive or use some version control system is your decision, but even
experienced programmers and integrators need the old sources now and then.
And note that even though I (the author of <span class="application">KDiff3</span>) try to do my best, I can't
guarantee that there are no bugs. According to the GNU-GPL there is NO WARRANTY
whatsoever for this program. So be humble and always keep in mind:
</p><div class="blockquote"><blockquote class="blockquote"><p>
<span class="emphasis"><em>To err is human, but to really mess things up you need a computer.</em></span>
</p></blockquote></div><p>
So this is what this program can do for you: <span class="application">KDiff3</span> ...
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-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
before starting the directory merge,</p></li><li class="listitem"><p>... lets you simulate the merge and lists the actions that would
take place, without actually doing them,</p></li><li class="listitem"><p>... lets you really do the merge, and lets you interact whenever
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></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><td class="nextCell"><a accesskey="n" href="startingdirmerge.html">Next</a></td></tr><tr><td class="prevCell">Preprocessor Commands </td><td class="upCell"> </td><td class="nextCell"> Starting Directory Comparison Or Merge</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>
|