Visually compare and merge files within Windows, Mac OS X and Linux.
http://www.sourcegear.com/diffmerge/downloads.php
Architecture
A.T.F.
References