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.
Versions for OS X 10.6, 10.7, 10.8 and 10.9 are available here.Version 2014.4581:
Note: Now requires OS X 10.10 or later.
Enhancements
- Merge is fully supported and tested on OS X Yosemite. I14218I14271
- The Apache Tika library used by Merge to extract text from various types of files has been updated to the latest version. This should improve the ability of Merge to extract text from previously problematic files. I14098I14099
- Merge no longer requires a system Java Runtime Environment (JRE) to be installed for certain text extraction filters to work. (As a consequence, Merge .dmg download sizes have increased.) I14232
- An Apply to All checkbox has been added to the dialog that appears when deleting items in a folder comparison that cannot be moved to the Trash. I12816
- Unsaved file and folder comparisons no longer include Untitled in their tab labels. I13698
- The operation of the Display tabs using n spaces preference has been changed so that tabs are displayed with a right arrow in place of the first space character. This helps distinguish the presence of a tab character from an equivalent sequence of spaces. I14000
- The git-difftool option --dir-diff is documented in the instructions for integrating Merge with Git. This option opens a folder comparison showing all the changed files. I14035
- The link to the git-mergetool documentation has been updated in the instructions for integrating Merge with Git. I14169
- Instructions have been provided for integrating with SourceGear Veracity. I14165
- The message that indicates that no file has been loaded in a file comparison panel is more concise. I14015
- Folder comparison change counts match those given by Merge for Windows. I12562
- Minor improvements have been made to the documentation. I14262I14263
Bugs fixed
- The command-line (AppleScript-based) utilities provided with Merge work reliably on OS X Yosemite when Merge is not already running. I14227
- On OS X Yosemite, hidden and resolved rows in a folder comparison are dimmed appropriately. I14264
- The top entry in comparison history sheets is no longer obscured by the column headers on OS X Yosemite. I14266
- A crash no longer occurs on OS X Yosemite when closing the Version sheet on a folder comparison that is currently comparing a Subversion repository using the svn:// protocol. I14268
- In folder comparisons on OS X Yosemite, the controls on the confirmation sheet that appears when copying files from one folder hierarchy to another are no longer positioned incorrectly. I14276
- In a folder comparison, conflict markers no longer disappear after an automatic merge to common ancestor if the whole comparison had previously been selected using Cmd+A. I12996
- After having opened the Registration dialog from the About window, the About window remains above the main application window when the Registration dialog is closed. I13426
- Toolbar buttons with drop-down menus are drawn with same shading as other toolbar buttons when the main application window does not have focus. I13656I14257
- OS X 10.10 or later
More information
Download Now