Araxis Merge 2008.3721

The two and three-way visual file comparison/merging and folder synchronization application. Use it to compare and merge source code, web pages, XML and other text files with native application performance. Directly open and compare the text from Microsoft Office (Word and Excel), OpenDocument, PDF and RTF files. Compare images and binary files. Synchronize folders. Perform code reviews and audits. Work with folder hierarchies containing thousands of files. Compare files against older versions of themselves stored in Time Machine.
Merge is a compelling choice for software developers, lawyers, product release managers, web designers and other professionals who work with multiple revisions of text files, including ASCII, MBCS and Unicode files. Merge integrates with many version control (VC) and software configuration management (SCM) systems (e.g. Subversion and Perforce) that allow a third-party comparison/merging tool to be specified. It can directly access Perforce and Subversion repositories. Many more features.