Screenshots and Features

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/screenshots.html | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 data/doc/screenshots.html (limited to 'data/doc/screenshots.html') diff --git a/data/doc/screenshots.html b/data/doc/screenshots.html deleted file mode 100644 index 23fdf40..0000000 --- a/data/doc/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