Eclipse 集成 Araxis Merge 作为比较和合并GUI工具的配置

更多有关 Araxis Merge的配置，请参考下面原文.

原文：http://www.araxis.com/merge/scm_integration.html

Eclipse

For Eclipse 

,
see the entry for Subclipse.

Subclipse

Subclipse 

 is
an Eclipse plug-in 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 1.6.13, Eclipse 3.6.0 and Subversion 1.6.

To configure Merge as the Subclipse merging tool:

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):

C:\Program Files\Araxis\Araxis Merge\compare.exe

Note: in the above path, replace C:\Program Files\Araxis\Araxis Merge\ with the full path of the Merge installation directory on your machine.

In the Parameters field, enter the following (all on one line):

/wait /merge /a1 /3 /title1:"Common Ancestor" /title2:"Theirs" /title3:"Yours" ${base} ${theirs} ${yours} ${merged}

Click the Apply button.