Martin Blais

Free
Graphical tool to compare/merge files/directories, and view/save the results.