A capable diff and merge program available on multiple platforms
Pros & Cons:
The application is similar to WinMerge with many of the same features.
KDiff3 compares or merges two or three text input files or directories, shows the differences line by line and character by character, all highlighted in bright colors for your attention.
It provides an automatic merge-facility and an editor for solving merge-conflicts. It also supports Unicode, UTF-8 and other file encodings, printing of differences, manual alignment of lines, integration into Windows Explorer for ease of use, together with many other features.
The developer has a comprehensive handbook, which you access it here, to guide users on this excellent application.
KDiff3 was reviewed by Gizmos Freeware on