Integration with Configuration Management Systems

Here are the steps to configure Accurev (3.5 or later) to use Ellié Computing Merge for file comparison and merging:

1. Open the File/Preferences/Diff menu
2. Select Other
3. Enter the following command line:
   <path_to_guimerge.exe> %1% %2% --mode=diff2
4. Open the File/Preferences/Merge menu
5. Select Other
6. Enter the following command line:
   <path_to_guimerge.exe> %a% %1% %2% --to="%o%"

There are two big cases:

• If you care only of 2-way differentiation, here are the steps to configure Rational ClearCase to use Ellié Computing Merge for file comparison and merging:

1. Go into the "C:\Program Files\Rational\ClearCase\lib\mgrs" directory.
2. Create a backup of the file named "map".
3. Edit "map" and change the line:
     text_file_delta xcompare ..\..\bin\cleardiffmrg.exe  text_file_delta compare ..\..\bin\cleardiffmrg.exe
   to:
     text_file_delta xcompare path_to_guimerge.exe  text_file_delta xcompare path_to_merge.exe 

• If you want full integration, please download:
  http://www.elliecomputing.com/soft/ecmerge-cc-integration-2.1.74-all.zip
  Then follow the instructions for your platform, currently integration exists for Windows and Linux x86, for other platforms please contact us so that we build the tools and then work with you to check integration.

Here are the steps to configure CS-RCS to use Ellié Computing Merge for file comparison and merging:

1. Choose "Project/Settings" from CS-RCS's Document Explorer
2. Select the "File Types" tab
3. Click on the "Default..." button
4. In the Difference Analysis Tool section, choose Custom Tool and fill in the path to guimerge.exe in the Ellié Computing Merge directory. Ensure that Use long names is checked.
5. In the Merge Analysis Tool section, choose Custom Tool Base 1 and fill in the path to guimerge.exe in the Ellié Computing Merge directory. Ensure that Use long names is checked.

Here are the steps to configure FreeVCS 2.2 to use Ellié Computing Merge for file comparison:

1. Open the FreeCVS Project Manager
2. Choose "Options/Properties"
3. Select Compare Tools
4. Click on the Add Custom button, enter ECMerge as the new name.
5. Select the newly created line in the list and click on the Edit button.
6. In the File compare utility, enter the path to guimerge.exe in the Ellié Computing Merge directory.
7. In the Command line parameter string", enter:
   --mode=diff2 %1 %2

GIT contains a pre-defined diff/merge tool configuration for ECMerge called 'ecmerge'.

1. Opens the configuration file
2. Alter or add the "merge.tool" entry, use the value 'ecmerge'
3. If not already set, add the "mergetool.ecmerge.path" value with the path of ECMerge executable.

Here are the steps to configure P4Win (2000.1 release or later) to use Ellié Computing Merge for file comparison and merging:

1. Open the Settings/Options menu.
2. Select the Files/Diff category.
3. Select the User supplied Diff application radio button.
4. Click o the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory.
5. Check the Optional args option and enter the following string
   %1 %2 --mode=diff2 --title1="%L" --title2="%R"
6. Select the Files/Merge tab.
7. Select the User supplied Diff application radio button.
8. Click o the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory.
9. Check the Optional args option and enter the following string
   %1 %2 %3 --mode=merge3 --to="%4" --title1="%Y" --title2="%T"

Here are the steps to configure QVCS 3.10 to use Ellié Computing Merge for file comparison:

1. Open the Admin/Preferences... menu 
2. Select the "Utilities" tab
3. In the Visual Compare Utility Command Line type the path to guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   "%s" "%s" --mode=diff2

Here are the steps to configure Surround SCM to use Ellié Computing Merge for file comparison and merging:

1. Choose Tools/User Options
2. Select the Diff/Merge category.
3. Select Use selected diff/merge utilities
4. In the 2-way diff utility, click on the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   %1 %2 --mode=diff2
5. In the 3-way diff utility, click on the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   %3 %1 %2 --mode=diff3
6. In the 2-way merge utility, click on the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   %1 %2 --mode=merge2 --to="%2"
7. In the 3-way merge utility, click on the Browse... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters: %3 %1 %2 --mode=merge3 --to="%2"
8. Uncheck Use diff/merge utility to compare binary files.

Here are the steps to configure SourceOffSite to use Ellié Computing Merge for file comparison and merging:

1. In the Client's application, choose the Tools/Options menu
2. Select the External Programs tab
3. Enter the path to guimerge.exe in the Ellié Computing Merge directory in the "Application for comparing files", "Application for comparing directories", and "Application for merging files" fields.

Here are the steps to configure StarTeam to use Ellié Computing Merge for file comparison and merging:

1. Select Tools/Personal Options from the menu bar.
2. Choose the Files tab.
3. Click on the Alternate Applications button.
4. Select the Merge Utility check box.
5. Type the path to or browse for guimerge.exe in the Ellié Computing Merge directory in the text box
6. In the Options text box, enter the following parameters:
   --title1="Branch Tip" --title2="Common Ancestor (merge here)" --title3="Your Version" --mode=merge3 $branchtip $basefile $usertip --to=$resultfile

Here are the steps to configure Team Coherence to use Ellié Computing Merge for file comparison and merging:

1. Open the Tools/Options menu
2. Click on the Difference Viewers category
3. Click on the ... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   $LF $RF --mode=diff2 --title1="$LD" --title2="$RD"

Here are the steps to configure Microsoft Team Foundation Server to use Ellié Computing Merge for file comparison and merging:

1. Open the File/Options... menu
2. Expand Source Control in the tree view
3. Click on "Visual Studio Team Foundation Server" in the tree view
4. Click on the Configure User Tools... button
5. Click on the Add... button to create each new entry:

Here are the steps to configure Tortoise SVN to use Ellié Computing Merge for file comparison:

1. Open the TortoiseSVN Settings dialog,
2. Click on the External Programs/Diff Viewer page.
3. Select "External" option
4. Clik on the ... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   %base %mine --mode=diff2 --title1='%bname' --title2='%yname'

Here are the steps to configure Tortoise SVN to use Ellié Computing Merge for file merging:

1. Open the TortoiseSVN Settings dialog,
2. Click on the External Programs/Merge Tool page.
3. Select "External" option
4. Clik on the ... button and select the file guimerge.exe in the Ellié Computing Merge directory. Add the following parameters:
   %base %mine %theirs --mode=merge3 --title0='%bname' --title1='%yname' --title2='%tname' --to="%merged" --to-title='%mname'

Here are the steps to configure VersionMaster 2.0 to use Ellié Computing Merge for file comparison:

1. Open the Tools/Options menu
2. Select the "Visual Differencing" tab
3. Select the "Use Customer Visual Differencer" choice
4. Click o the ... button and select the file guimerge.exe in the Ellié Computing Merge directory.

Visual SourceSafe 2005 enables third party tools like Ellié Computing Merge to be used for comparison and merging. Here are the steps to configure Visual SourceSafe to use Ellié Computing Merge:

1. Open the Tools/Options... menu
2. Select the Custom Editors page
3. In the Editors list, add 2 new entries:
   

   File Extension	Operation	Command Line
   .*	File Difference	path_to_guimerge.exe --mode=diff2 %1 %2
   .*	File Merge	path_to_guimerge.exe --mode=merge3 %3 %1 %2 --to="%4"

Visual SourceSafe 6.0 and earlier do not support external difference utilities.