Important note
These instructions have been kindly provided by Kevin Conroy of Philips Semiconductors, one of our customers. Araxis technical support has not verified that these instructions work and provides them here "as is" in the hope that they may be helpful.
Instructions
These details are for a Continuus client running on a PC. These details refer to Continuus/CM 4.5, not the more recent 5.1.
The c:\winnt\ccm.ini (where c: is the drive where the operating system is installed) file needs editing to tell it about Merge. Assuming that you have installed Merge in the default directory on drive c:, add the following to your ccm.ini file:
proj_compare_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare.exe /2
%file1 %file2 %outfile
dir_compare_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare.exe /2
%file1 %file2 %outfile
symlink_compare_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare.exe /2
%file1 %file2 %outfile
compare_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare.exe /2
%file1 %file2 %outfile
merge_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare /wait /2
/title1:"%file1_label" /title2:"%file2_label" %file1
%file2 %outfile
Note: Indentation above shows continuation of the previous line.
This will do a two-way merge. To do a ClearCase-style three-way merge, replace the last line with:
merge_cmd = C:\PROGRA~1\Araxis\ARAXIS~1\compare /wait /3
/a3 /title1:"%file1_label" /title2:"%file2_label"
%file1 %file2 %ancestor %outfile
Note the use of DOS-style short filenames in the paths to compare.exe. These could be avoided by adding the Merge directory to your path environment variable. Under Windows NT/2000 this is done by right-clicking on My Computer, selecting the Environment tab, select "path" in the "user variables" section and manually adding the pathname onto the end of whatever is there.