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.
- Merge is fully supported, optimized, and tested on macOS Sierra.
- Since Merge already has built-in support for tabs, the window tabs that macOS Sierra automatically adds to multi-window applications have been turned off. This preserves the capability to have multiple, top-level Merge windows, and avoids duplicate tab strips.
- The Merge documentation has been updated in accord with Apple’s renaming of ‘OS X’ to ‘macOS’. (Even though OS X Yosemite and OS X El Capitan are still supported, the documentation generally refers exclusively to ‘macOS’, rather than the clumsier ‘macOS and OS X’.)
- All URLs in Merge that reference the Araxis website have been updated to use HTTPS, rather than HTTP. This improves security and avoids unnecessary redirects.
- Merge services for macOS have been re-introduced as an optionally installable feature. These services add commands to the Services submenu of the Finder context menus that appear when you right-click (or Ctrl-click) selected files or folders. Keyboard shortcuts may be configured for the Merge services via macOS System Preferences (System Preferences > Keyboard > Shortcuts > Services > Files and Folders).
- The image comparison Scale control has been renamed to Zoom, since the latter terminology is generally more widespread in other applications.
- The number of markers on the image comparison Zoom slider has been reduced, to make it easier to see the centre, 100% setting.
- A 100% zoom button has been added to image comparisons. This provides a quick way to reset the zoom, displaying the images at their actual size.
- Images in image comparisons may now be magnified by up to 1600%, making it much easier to see pixel-level detail.
- The state of the folder comparison Hide Empty Folders, Hide Unchanged Rows, Visibility Filters…, and Show Hidden Items settings are now preserved between invocations of Merge. (When multiple folder comparisons are open simultaneously with different settings, the settings of the last folder comparison that is closed will be preserved.)
- Folder comparisons have a new command Actions▸Select Rows▸Select Unchanged, also available from the toolbar via Select Rows▸Select Unchanged.
- In a text comparison, using the up/down arrow keys to move the cursor one line past the top or bottom of the currently displayed text now results in one line of text being scrolled into view, rather than half a screen.
- The file and folder comparison report examples in the documentation have been updated, and also localized into Japanese.
- The Merge extension for Finder (see Integrating with Finder) has been corrected to work with items on all mounted disk volumes, rather than just those on the root volume.
- The tooltips for the Edited and Read-only indicators in text comparisons have been corrected.
- Folder comparison HTML reports now leave the changes column blank for added/removed items, rather than showing >0. This is to match the folder comparison display within Merge itself.
- Merge no longer becomes unresponsive when attempting to hide only the last row of a folder comparison.
- Tooltips shown for paths in text comparison history lists no longer end with (null).
- The capitalization of the checkbox control labels on image and binary comparisons has been corrected.
OS X 10.11 or later, 64-bit processor