Comment on KDiff3

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