/[http://wiki.kde.org/tiki-index.php?page=KDE+Community+World+Summit|aKademy] / [http://wiki.kde.org/tiki-index.php?page=Talks+@+aKademy|Talks] / KDiff 3 Talk

-=KDiff 3 by Joachim Eibl=-

A tool for comparison, synchronisation and merge of files and directories.

Other free diff tools exist, GNU Difftools, Meld (Python/Gnome), Xxdiff, Kompare in kdesdk, others.  

Getting started, command line is `kdiff3 file1 file2 [file3]`.  Open dialogue works.  Drag and Drop also works.  Copy and paste too.  Demonstration of copying and pasteing to show the difference between two classes.

KDiff3 makes sure matching lines are at the same level, a space is shown if there is no corresponding lines in a diff.

Overview columns are the colour coded scroll bars that let you jump through the files.

KDiff3 has a merge function.  This can be used when you have two files with a common base and you want to decide which changes to merge.

Sed is the perfect tool for preprocessing, KDiff3 uses it to change what you see and get.

Directory comparison, synchronisation and merge is possible.  It can do automated merge.  He gave an example of merging lots of files in a single directory.  There are various options for how to perform the merge, automatically or by hand.

KIO means you can access large FTP files or compare .tar files etc.

KDiff3 is a KPart so can be used within KDevelop.  There is a Windows binary available, required for the author to be able to use it at work.  It is well documented.

Future features should include Unicode support, binary comparison, printing, other filetypes.