From 02081598c2dcf7faaa89ddac463232dce3aab215 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 17:53:15 -0500 Subject: Update files and references in support of bug report 1446. --- doc/en/screenshots.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/en/screenshots.html') diff --git a/doc/en/screenshots.html b/doc/en/screenshots.html index badb664..a63712d 100644 --- a/doc/en/screenshots.html +++ b/doc/en/screenshots.html @@ -1,4 +1,4 @@ -Screenshots and Features
Screenshots and Features
Prev
Next
Introduction

Screenshots and Features

This screenshot shows the difference between two text files

(Using an early version of KDiff3):

+Screenshots and Features

Screenshots and Features
Prev
Next
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. -- cgit v1.2.1