Araxis Merge is the two- and three-way visual file comparison/merging and folder synchronization application. Use it to compare, understand and combine different versions of source code, Web pages and other text files, or even text copied and pasted from another application (e.g., Pages or Microsoft Word). Merge integrates with Time Machine, so you can compare older versions of files.
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.
For legal professionals: instantly identify every change by copying text from different contract drafts being edited in another application (such as Microsoft Word) and pasting it directly into a file comparison window. Many more features.
The choice of software, web design, legal and publishing professionals. Compare source files, web pages and contract drafts.
Text comparison and merging
Spot changes between source, HTML, XML or other text file revisions. Accept, merge, edit or delete them.
Compare text from common office files
Directly compare text from Microsoft Word and Excel, OpenDocument (ODF), PDF and RTF files.
Image and binary comparison
Pixel comparison for images. Byte-level comparison for binary files.
3-way comparison and automatic merging Pro
Swiftly reconcile even the largest sets of revision-managed files. Perfect for team development.
Folder comparison and sync
Conveniently compare and interactively merge entire folder trees.
Direct access to SCM (version control) systems
Direct repository access for select systems. Integration with dozens of others.
Generate HTML, XML and UNIX diff reports to share with your colleagues.
Printing and automation
Print a hard copy of comparisons. Write scripts to automate Merge.
OS - MacOSX 10.8 or Later
Home Page - http://www.araxis.com/merge/