Araxis Merge 2016
Advanced 2 and 3-way diff & merge
Broad appeal, many uses.
Broad appeal, many uses. The choice of software, web design, legal and publishing professionals. Compare source files, web pages and contract drafts.
Compare text from common office file formats
Directly compare text from Microsoft Word and Excel, OpenDocument (ODF), PDF and RTF files.
3-way comparison and automatic merging
Swiftly reconcile even the largest sets of revision-managed files. Perfect for team development.
Direct access to configuration management (SCM) systems
Direct access to configuration management (version control) systems, Time Machine and FTP sites. Direct repository access for select systems. Integration with dozens of others.
As well as being able to compare files and folders on local drives and network shares, Merge comes with plugins for Git, Mercurial, Subversion and Perforce. In addition to providing read-only access to older versions of the files you are comparing, the plugins make it possible to perform a folder comparison of a local Perforce or Subversion client workspace against the repository. Alternatively, different branches (or the same branch at different points in time) within a repository can be directly compared. A similar plugin for AllChange is available from Intasoft.
Printing, automation and other advanced features.
Print a hard copy of comparisons. Write scripts to automate Merge.
Text comparison and merging.
Spot changes between source, HTML, XML or other text file revisions. Accept, merge, edit or delete them.
Image and binary file comparison
Pixel comparison for images. Byte-level comparison for binary files.
Folder hierarchy comparison and synchronization
Conveniently compare and interactively merge entire folder trees.
Generate HTML, XML and UNIX diff reports to share with your colleagues.
One licence, two platforms.
A single licence entitles you to use Merge on both Windows and OS X.