summaryrefslogtreecommitdiffstats
path: root/doc/html/startingdirmerge.html
diff options
context:
space:
mode:
authorgregory guy <[email protected]>2020-06-27 14:46:01 +0200
committerMichele Calgaro <[email protected]>2020-06-27 23:56:04 +0900
commita2bdb366d23ad3ae27e317bbdf5c966c71863d75 (patch)
tree2ac4e8942bd42ccaf1dead861cb7f68bcce4e5ed /doc/html/startingdirmerge.html
parent91b7acd6bbe54b36f6e4b9597c4cf5572c9eb40c (diff)
downloadkdiff3-a2bdb366d23ad3ae27e317bbdf5c966c71863d75.tar.gz
kdiff3-a2bdb366d23ad3ae27e317bbdf5c966c71863d75.zip
Drop automake build support.
Add basic cmake build instructions. Delete the NEWS file. Rework of the README. The man folder has been moved into the doc folder for consistency with what have been done so far. The html pages have been moved into the doc folder as well. Some cosmetics. Signed-off-by: gregory guy <[email protected]> (cherry picked from commit e14732aa76b0fc20b955da434b1e2e92012c34e8)
Diffstat (limited to 'doc/html/startingdirmerge.html')
-rw-r--r--doc/html/startingdirmerge.html22
1 files changed, 22 insertions, 0 deletions
diff --git a/doc/html/startingdirmerge.html b/doc/html/startingdirmerge.html
new file mode 100644
index 0000000..fc5e84f
--- /dev/null
+++ b/doc/html/startingdirmerge.html
@@ -0,0 +1,22 @@
+<html><head><title>Starting Directory Comparison Or Merge</title><link rel="stylesheet" href="help:/common/tde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.67.2"><meta name="keywords" content="KDE, kdeextragear, kdiff3, diff, merge, CVS, triplediff, compare, files, directories, version control, three-way-merge, in-line-differences, synchronise, kpart, tdeio, networktransparent, editor, white space, comments"><link rel="start" href="index.html" title="The KDiff3 Handbook"><link rel="up" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="prev" href="dirmerge.html" title="Chapter 3. Directory Comparison and Merge with KDiff3"><link rel="next" href="dirmergevisible.html" title="Directory Merge Visible Information"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div style="background-image: url(help:/common/top-middle.png); width: 100%; height: 131px;"><div style="position: absolute; right: 0px;"><img src="help:/common/top-right-konqueror.png" style="margin: 0px" alt=""></div><div style="position: absolute; top: 25px; right: 100px; text-align: right; font-size: xx-large; font-weight: bold; text-shadow: #fff 0px 0px 5px; color: #444">Starting Directory Comparison Or Merge</div></div><div style="margin-top: 20px; background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergevisible.html">Next</a></div><div class="navCenter">Directory Comparison and Merge with <span class="application">KDiff3</span></div></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="startingdirmerge"></a>Starting Directory Comparison Or Merge</h2></div></div></div><p>
+ This is very similar to the single file merge and comparison. You just
+ have to specify directories on the command line or in the file-open
+ dialog.
+</p><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2568158"></a>Compare/Merge two directories: </h3></div></div></div><pre class="screen">
+ <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span>
+ <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+</pre><p>
+ If no destination directory is specified, then <span class="application">KDiff3</span> will use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir2</code></em></span>.
+</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="id2568202"></a>Compare/Merge three directories: </h3></div></div></div><pre class="screen">
+ <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span>
+ <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><span><strong class="command">kdiff3</strong></span></span> <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1 dir2 dir3</code></em></span> -o <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>destdir</code></em></span>
+</pre><p>
+ When three directories are merged then <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir1</code></em></span>
+ is used as the base for the merge.
+ If no destination directory is specified, then <span class="application">KDiff3</span> will use <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="replaceable"><em class="replaceable"><code>dir3</code></em></span>
+ as the destination directory for the merge.
+</p><p>
+ Note that only the comparison starts automatically, not the merge. For this you first must
+ select a menu entry or the key F7. (More details later.)
+</p></div></div><div style="background-color: #white; color: black; margin-top: 20px; margin-left: 20px; margin-right: 20px;"><div style="position: absolute; left: 20px;"><a accesskey="p" href="dirmerge.html">Prev</a></div><div style="position: absolute; right: 20px;"><a accesskey="n" href="dirmergevisible.html">Next</a></div><div align="center"><a accesskey="h" href="index.html">Home</a></div></div><div style="background-color: #white; color: black; margin-left: 20px; margin-right: 20px;"><div class="navLeft">Directory Comparison and Merge with <span class="application">KDiff3</span> </div><div class="navRight"> Directory Merge Visible Information</div><div class="navCenter"><a accesskey="u" href="dirmerge.html">Up</a></div></div><br><br><div class="bannerBottom" style="background-image: url(help:/common/bottom-middle.png); background-repeat: x-repeat; width: 100%; height: 100px; bottom:0px;"><div class="BannerBottomRight"><img src="help:/common/bottom-right.png" style="margin: 0px" alt=""></div><div class="bannerBottomLeft"><img src="help:/common/bottom-left.png" style="margin: 0px;" alt=""></div><div id="comments" style="position:relative; top: 5px; left: 1em; height:85px; width: 50%; color: #cfe1f6"><p>Would you like to make a comment or contribute an update to this page?<br>
+ Send feedback to the <a href="mailto:[email protected]" style="background:transparent; color:#cfe1f6; text-decoration: underline;">KDE Docs Team</a></p></div></div></body></html> \ No newline at end of file
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-02 03:19:14 +0000