Merge integrates with most version control (VC) and software configuration management (SCM) systems that allow a third-party
comparison/merging tool to be specified. Other applications, such as editors, also sometimes allow a comparison tool to be
specified. Merge can be integrated with such applications via its AppleScript API or with its command-line utility.
The table below summarizes the applications that we have been told work with Merge. If your chosen system isn’t listed on
this page, you might find the information for integrating Merge for Windows with other applications to be a helpful starting point.
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.
| System |
Description |
|
Dreamweaver 
|
Adobe (Macromedia) Dreamweaver CS3 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.
To configure Dreamweaver CS3 to use Merge as the file comparison tool:
-
Ensure that the command-line utilities have been installed as described in the Installing the Merge command-line utilities section of the Installing from the Araxis Website page.
-
Chose > .
-
Select the File Compare category.
-
Click the Browse... button to bring up the Select External Editor dialog.
-
Locate and select the Merge compare command-line utility from the folder in which you have installed it.
-
Click the Open button. The full path to the Merge compare command-line utility should now be shown in the Choose application to compare files entry field.
-
Click OK to dismiss the Preferences dialog.
|
|
Eclipse
|
See the entry for Subclipse.
|
|
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.
To browse Perforce repositories directly from Merge:
To configure P4V (2007.2 release or later) to use Merge for file comparison and merging:
-
Ensure that the command-line utilities have been installed as described in the Installing the Merge command-line utilities section of the Installing from the Araxis Website page.
-
Choose from the menu.
-
Select the Diff tab.
-
Select the Other application radio button (or Use external application in older versions of P4V).
-
For the Location field, click the Browse button for the user supplied diff application, and select the file araxisp4diff from the folder in which you have installed it.
-
Ensure that the Arguments field reads %1 %2. This step can be ignored for older versions of P4V, which do not have this field.
-
Select the Merge tab.
-
Select the Other application radio button (or Use external application in older versions of P4V).
-
For the Location field, click the Browse button and select the file araxisp4winmrg from the folder in which you have installed it.
-
Ensure that the Arguments field reads %b %1 %2 %r. This step can be ignored for older versions of P4V, which do not have this field.
-
Click the OK button to dismiss the Preferences dialog.
-
P4V should now open Merge for its comparison and interactive merging operations.
To configure the Perforce command-line tool (p4) to use Merge:
-
Ensure that the command-line utilities have been installed as described in the Installing the Merge command-line utilities section of the Installing from the Araxis Website page.
-
Set the P4DIFF environment variable to the full path of the araxisp4diff utility. Also, set the P4MERGE environment variable to the full path to araxisp4winmrg.
For example, if you have placed the Merge command-line utilities in ~/bin, you might add the following to your .bash_profile:
export P4DIFF=$HOME/bin/araxisp4diff
export P4MERGE=$HOME/bin/araxisp4winmrg
-
When you open a new command shell, Merge should now be invoked as appropriate by the Perforce command-line tools. For example,
p4 diff -t
will open up a two-way comparison for each of the files that you have opened for edit (including any binary or image files)
in your default changelist.
|
|
Subclipse
|
Subclipse, an Eclipse plugin providing support for Subversion within the Eclipse IDE, can be configured to use Merge as its merging tool. Once that has been done, Merge will be used whenever you choose from a menu in Eclipse.
Merge can also integrate directly with Subversion. Please see Subversion for more information.
To configure Merge as the Subclipse merging tool:
-
Ensure that the command-line utilities have been installed as described in the Installing the Merge command-line utilities section of the Installing from the Araxis Website page.
-
In the Eclipse Preferences window, select the Team > SVN > Diff/Merge page.
-
Select the External radio button.
-
In the adjacent entry field, enter the following (all on one line):
/Users/<userid>/bin/compare
Note: in the above path, replace /Users/<userid>/bin/compare with the full path to the Merge Merge compare command-line utility that you have installed on your machine.
-
In the Parameters field, enter the following (all on one line):
/a2 /max /wait /3 /title1:"Theirs" /title2:"Common Ancestor" /title3:"Yours" "${theirs}" "${base}" "${yours}" "${merged}"
|
|
Subversion
|
Merge integrates well with Subversion. Araxis provides a Subversion File System Plugin to enable Merge to browse Subversion 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.
See also the entries for svnX and Subclipse.
To browse Subversion repositories directly from Merge:
To configure the Subversion command-line tool (svn) to use Merge:
-
Ensure that the command-line utilities have been installed as described in the Installing the Merge command-line utilities section of the Installing from the Araxis Website page.
-
Open your ‘SVN configuration area’ configuration file in a text editor. The default location for this file is ~/.subversion.
-
Uncomment the line that specifies the diff-cmd and set its value to the path of the Merge araxissvndiff executable that you have installed on your machine. For example:
diff-cmd = /Users/fred/bin/araxissvndiff
-
Also uncomment the line that specifies the diff-cmd3 and set its value to the path of the Merge araxissvndiff3 executable that you have installed on your machine. For example:
diff3-cmd = /Users/fred/bin/araxissvndiff3
-
Save the modified configuration file and exit the text editor.
-
Merge will now be launched when performing Subversion commands (e.g. svn diff and svn merge) that require a two or three-way comparison.
|
|
svnX
|
svnX is a tidy GUI client for Subversion. It has built-in support for Merge, for which we are grateful.
To configure svnX to use Merge:
|
Other applications
If your application isn’t in the above list and you manage to successfully use Merge with it, or if you have corrections to
the information presented here, please contact us to let us know so that we can update this list. It would be especially helpful if you could include detailed instructions
for configuring your Application to use Merge so that we can provide them here.
If the Application product that you use doesn’t allow a third-party tool to be specified, please contact the developers and
request that they support Merge. In the meantime, you can still use Merge efficiently as a standalone application.
Let us help you!
If you are the developer of an application that could benefit from integration with Merge, Araxis would be pleased to assist
you integrate Merge with your product. Please contact Araxis for further information.
