KDiff3

Version: 0.9.95 || Release Date: 2012-08-12 || License: GPL Developer: Joachim Eibl | App Owner: kirk_ireson

KDiff3 is a graphical text difference analyzer for up to 3 input files, provides character-by-character and line-by-line analysis and a text merge tool with integrated editor for comfortable solving of merge-conflicts. It can also compare and merge directories.

Suggest screenshot/icon / Suggest new version

2 Opinions

Works well to compare folders, with these settings:
In 'directory merge' tab:
* filter out .DS_Store files
* check 'follow file links'

0.9.92 is still the latest version with a Mac binary available for download (newer versions, for now, require compiling with Qt).