kdiff3
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...
- Free
- Open Source
- Mac OS X
- Windows
- Linux
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 mergefacility, has an editor for comfortable solving of mergeconflicts, provides networktransparency via kio, has options to highlight or hide changes in whitespace or comments, supports unicode, utf8 and other file encodings, prints differences, supports version control keyword and history merging.
Links to official kdiff3 sites
Features
Version and Source control Folder Comparison
Categories
Productivity Developer Tools File Management
Tags
Discontinued version-control-system hex-viewer diff file-compare folder-compare merging
