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.
- When the appropriate preference is enabled, line endings are indicated with CR and LF characters, rather than with arrows; this change makes the type of line endings obvious, and also makes Merge for macOS more consistent with Merge for Windows
- When preferences are changed, Merge endeavours to maintain the following for each open comparison: the cursor positions within each panel, the current scroll position, and the focused panel
- The various command-line utilities give a much more helpful error message when an evaluation serial number has expired
- Merge supports the macOS Automator Text Service
- The Merge services for macOS are installed (or, if necessary, updated) automatically by Merge, eliminating a tedious manual installation step
- The instructions for integrating with Mercurial have been improved; if you use Mercurial, please review your configuration for an improved experience
- All file comparisons show No file is loaded within this panel in a file panel whenever appropriate
- Expressions that do not have descriptions appear in the toolbar Expressions menu, with the regular expression as the item label; previously, the menu item was blank.
- When acting on a single file, the Services▸Compare using Araxis Merge menu item opens the file in both panels of a comparison, in the same way as the equivalent Finder-extension menu item; if other versions of the file are available, this makes it easy to compare the file against another version of itself using the Versions button.
- Various minor memory leaks have been addressed
- The compare utility -max option works
- Cycling the focus between comparison controls using Tab and Shift+Tab works correctly
- Tab tooltips work on OS X 10.11 El Capitan
- After a merge-to-common-ancestor operation, the Next Change and Previous Change buttons are appropriately enabled or disabled
- After performing an automatic merge with conflicts, the first conflict is shown
- A minor glitch in drawing the tab bar has been fixed
- The Insert Token drop-down controls on the Preferences▸File/Folder Comparisons▸Printing preference pages will only insert tokens into their accompanying text entry fields
- When no rows are selected in a folder comparison, clicking Next Change selects the first changed folder or file; before, only a first changed file would be selected
- On the Standard Edition of Merge, history lists no longer inappropriately show a third column
- Hidden items in folder comparisons are always drawn dimmed when hidden items are made visible
- It is no longer theoretically possible for comparison panel messages to become misaligned
- Folder comparison reports no longer inappropriately create file comparison reports for binary and image files
- The non-functional AppleScript sample 17, Set up a regular expression preference, has been removed
- No warnings appear in the system console when running Merge on macOS 10.12 Sierra
macOS 10.12 or later, 64-bit processor