kdiff3 - Compare + merge 2 or 3 files or directories

Description:

KDiff3 is a program that
- compares and merges two or three input files or directories,
- shows the differences line by line and character by character (!),
- provides an automatic merge-facility and
- an integrated editor for comfortable solving of merge-conflicts
- has support for KDE-KIO (ftp, sftp, http, fish, smb)
- and has an intuitive graphical user interface.

Homepage: http://kdiff3.sourceforge.net/

License: GPL

Packages

kdiff3-0.9.90-7.fc6.ppc64 [1.9 MiB] Changelog by Christian Iseli (2006-10-05):
- rebuilt for unwind info generation, broken in gcc-4.1.1-21