Merge for macOS integrates with most version control (VC), software configuration management (SCM) and other applications that allow a third-party file comparison (diff) or file merging tool to be specified. This page contains instructions for integrating Merge with the following applications:
Integration with many SCM systems requires the Professional Edition of Merge to enable the comparison of two modified versions of a file with their common ancestor.
Other applications
If your chosen application isn’t listed on this page, you may find the information for integrating Merge for Windows with other applications to be a helpful starting point. You may also be able to integrate Merge with another application yourself, using the Merge AppleScript API or command-line utility.
If you have instructions for integrating Merge with other systems, or corrections to the information presented below, please contact us to let us know so that we can update this list.
AccuRev
The AccuRev macOS client can be configured to use Araxis Merge for file comparison and merge operations.
These steps are believed to work with AccuRev 5.2.
Cornerstone
Zennaware Cornerstone is a Subversion client that has built-in support for Merge. The following instructions have been tested with Cornerstone v2.7.9.
Dreamweaver
Adobe (Macromedia) Dreamweaver CS6 integrates with Araxis Merge and can launch a two-way file comparison. Consequently, the Standard Edition of Merge is sufficient if you will be using it only with Dreamweaver.
The following instructions have been tested with Dreamweaver CS6 v12.0.
Eclipse
For Eclipse, see the entry for Subclipse.
Git
Merge integrates tightly with Git. Araxis provides a Git File System Plugin to enable Merge to access files in Git depots directly. For file comparisons (but not folder comparisons), Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).
Git can also be configured to use Merge for file comparison and merge operations.
The following configuration steps have been tested with Git v1.7.12.4.
IntelliJ IDEA/PhpStorm
IntelliJ IDEA and PhpStorm can be configured to use Merge for file and folder comparisons, and also for file merging. The following steps have been tested with IntelliJ IDEA 12.1.1.
MacHg
MacHg is a fully featured free Mercurial client for macOS. MacHg provides built-in support for Araxis Merge.
The following instructions have been tested with MacHg v0.9.25.
Mercurial
Merge integrates tightly with Mercurial. Araxis provides a Mercurial File System Plugin to enable Merge to access files in Mercurial depots directly. Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).
Mercurial can also be configured to use Merge for file/folder comparison and file merge operations. The comparison integration uses the Extdiff extension, which is supplied with Mercurial.
The following instructions have been tested with Mercurial v1.8.4.
Path Finder
Path Finder can be configured to use Araxis Merge for file comparison. Allowing the launching of Merge from Path Finder’s Compare… context menu when two files are selected.
The following instructions have been tested with Path Finder 7.
Perforce
Merge integrates tightly with Perforce. Araxis provides a Perforce File System Plugin to enable Merge to browse Perforce depots directly. This means that, for example, you can compare branches of source code directly within a depot without syncing them to the client workspace. Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).
SmartGit/Hg
SmartGit/Hg can be configured to use Araxis Merge for file comparison and merge operations.
SmartSVN/SmartCVS
SmartSVN and SmartCVS clients can be configured to use Araxis Merge for file comparison and merge operations.
Note that the ability to use an external tool for solving conflicts is not available in the Foundation version of SmartCVS.
The following instructions have been tested with SmartSVN v7.5.4.
SourceTree
Atlassian SourceTree is a client for Git and Mercurial. The following instructions have been tested with SourceTree v1.6.0.
Subclipse
Subclipse is an Eclipse plugin providing support for Subversion within the Eclipse IDE. It can be configured to use Merge as its merging tool. Merge will then be used whenever you choose Edit Conflicts from a Team menu in Eclipse.
Merge can also integrate directly with Subversion. Please see Subversion section for more information.
The following steps have been tested with Subclipse v1.8.18, Eclipse v4.2.1 and Subversion v1.6.18
Subversion
Merge integrates well with Subversion. Araxis provides a Subversion File System Plugin to enable Merge to browse Subversion repositories directly. This means that, for example, you can compare branches of source code directly within a repository without syncing them to the client workspace. Merge is also able to populate the Versions button drop-down versions menu with other revisions of each file being compared. For more information, see Comparing Text Files (or Typed/Pasted Text).
See also the entries for Subversive, svnX and Subclipse.
Subversive
Subversive, the official Eclipse plugin can be configured to use Merge as its merging tool. It provides support for Subversion within the Eclipse IDE. Merge will then be used for file comparisons, and for merging whenever you choose Edit Conflicts from a Team menu in Eclipse.
Merge can also integrate directly with Subversion. Please see Subversion section for more information.
The following steps have been tested with Subversive v1.0.0, Eclipse v4.2.1 and Subversion v1.6.18
Surround SCM
Surround SCM has built-in support for Araxis Merge. To set Araxis Merge as the default application for file comparison and merging:
- Choose User Options… from the Tools menu.
- Select the Diff/Merge tab.
- Edit the settings for a selected file type.
- Select Araxis Merge from the comparison application drop-down list.
Please see the Surround SCM website for more details.
svnX
svnX is an open source GUI for most features of the Subversion client. It has built-in support for Merge.
Tower
Tower is a client for Git that can be easily configured to use Araxis Merge as its preferred comparison and merging tool. The following instructions have been tested with Tower v1.5.0.
Veracity
Veracity is an Open Source, distributed version control and bug tracking system for Windows, macOS, and Linux. SourceGear, the company behind Veracity, has helpfully provided the information here.
Veracity supports Araxis Merge out of the box for both diff and merge operations. Simply use --tool araxis with any command that supports external comparison or merging tools. Alternatively, you can configure Merge as your default tool for various operations as described below.
For support using Veracity with Araxis Merge, please see http://veracity-scm.com/qa.
Versions
The Versions client for Subversion can be easily configured to use Araxis Merge. The following instructions have been tested with Versions v1.2.2.
