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.
Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons.
ExamDiff Pro is a powerful, intuitive, and easy to use visual side-by-side comparison tool for comparing and merging text and binary files, and directories.
Alternativein is a new approach to finding good application.
Just type what software you want to change and browse great alternatives,
based on our great community recommendations.