The KDiff3 Handbook
Next

# The KDiff3 Handbook

Joachim Eibl `<joachim.eibl at gmx.de>`

Revision 0.9.92 (2007-31-03)

Copyright © 2002-2007 Joachim Eibl

Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".

KDiff3 is a file and directory diff and merge tool which

- compares and merges two or three text input files or directories,

- shows the differences line by line and character by character(!),

- provides an automatic merge-facility,

- has an editor for comfortable solving of merge-conflicts,

- provides networktransparency via TDEIO,

- has options to highlight or hide changes in white-space or comments,

- supports Unicode, UTF-8 and other file encodings,

- prints differences,

- supports version control keyword and history merging.

This document describes KDiff3-version 0.9.92.

Next
Introduction

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