June 02, 2011

DiffMerge

Visually compare and merge files within Windows, Mac OS X and Linux.

http://www.sourcegear.com/diffmerge/downloads.php