Screenshots and Features

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. --- doc/en/screenshots.html | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 doc/en/screenshots.html (limited to 'doc/en/screenshots.html') diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html deleted file mode 100644 index 23fdf40..0000000 --- a/doc/en/screenshots.html +++ /dev/null @@ -1,15 +0,0 @@ -Screenshots and Features

Screenshots and Features

Introduction

Screenshots and Features

This screenshot shows the difference between two text files

(Using an early version of KDiff3):

- 3-way-merging is fully supported. This is useful if two people change code independently. - The original file (the base) is used to help KDiff3 to automatically select the correct - changes. - The merge-editor below the diff-windows allows you to solve conflicts, while showing you the output you will get. - You can even edit the output. - This screenshot shows three input files being merged: -

-

-

KDiff3 also helps you to compare and merge complete directories. -This screenshot shows KDiff3 during a directory merge: -

-

-

Introduction

More Features

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