Starting Directory Comparison Or Merge

From e14732aa76b0fc20b955da434b1e2e92012c34e8 Mon Sep 17 00:00:00 2001 From: gregory guy Date: Sat, 27 Jun 2020 14:46:01 +0200 Subject: 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 --- data/doc/startingdirmerge.html | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 data/doc/startingdirmerge.html (limited to 'data/doc/startingdirmerge.html') diff --git a/data/doc/startingdirmerge.html b/data/doc/startingdirmerge.html deleted file mode 100644 index fc5e84f..0000000 --- a/data/doc/startingdirmerge.html +++ /dev/null @@ -1,22 +0,0 @@ -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