Summary: Utility for comparing/merging up to three text files or directories

Description:
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 network transparency via KIO * has options to highlight or hide changes in white-space or comments
URL: https://github.com/KDE/kdiff3
License: GPLv2+

Last packager: daviddavid <daviddavid>