Starting Directory Comparison Or Merge

From 7478ca6e1437301482578bfcfa168fa6ace45bb5 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Mon, 13 Jan 2014 23:20:08 -0600 Subject: Fix help handbook, man page, and location of html doc files. --- data/doc/startingdirmerge.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 data/doc/startingdirmerge.html (limited to 'data/doc/startingdirmerge.html') diff --git a/data/doc/startingdirmerge.html b/data/doc/startingdirmerge.html new file mode 100644 index 0000000..fc5e84f --- /dev/null +++ b/data/doc/startingdirmerge.html @@ -0,0 +1,22 @@ +Starting Directory Comparison Or Merge

Starting Directory Comparison Or Merge

Directory Comparison and Merge with KDiff3

Starting Directory Comparison Or Merge

+ 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. +

Compare/Merge two directories:

+   kdiff3 dir1 dir2
+   kdiff3 dir1 dir2 -o destdir
+

+ If no destination directory is specified, then KDiff3 will use dir2. +

Compare/Merge three directories:

+   kdiff3 dir1 dir2 dir3
+   kdiff3 dir1 dir2 dir3 -o destdir
+

+ When three directories are merged then dir1 + is used as the base for the merge. + If no destination directory is specified, then KDiff3 will use dir3 + as the destination directory for the merge. +

+ 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.) +

Directory Comparison and Merge with KDiff3

Directory Merge Visible Information

Would you like to make a comment or contribute an update to this page?
+ Send feedback to the KDE Docs Team

\ No newline at end of file -- cgit v1.2.3