SCM Tool
|
Description
|
Accurev
|
Here are the steps to configure Accurev (3.5 or
later) to use Ellié Computing Merge for file
comparison and merging:
- Open the
File/Preferences/Diff menu
- Select
Other
- Enter the following command line:
<path_to_ecmerge.exe>
%1% %2% --mode=diff2
- Open the
File/Preferences/Merge menu
- Select
Other
- Enter the following command line:
<path_to_ecmerge.exe>
%a% %1% %2% --to="%o%"
|
ClearCase
|
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:
- Go into the "C:\Program
Files\Rational\ClearCase\lib\mgrs" directory.
- Create a backup of the file named "map".
- 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_ecmerge.exe
text_file_delta xcompare
path_to_merge.exe
|
FreeVCS
|
Here are the steps to configure FreeVCS 2.2 to use
Ellié Computing Merge for file comparison:
- Open the FreeCVS Project Manager
- Choose "
Options/Properties"
- Select
Compare Tools
- Click on the
Add Custom
button, enter
ECMerge
as the new name.
- Select the newly created line in the list and
click on the
Edit
button.
- In the
File compare utility
, enter the path to ecmerge
.exe in the Ellié Computing Merge
directory.
- In the Command line parameter string", enter:
--mode=diff2 %1
%2
|
GIT
|
GIT contains a pre-defined diff/merge tool
configuration for ECMerge called 'ecmerge'.
- Opens the configuration file
- Alter or add the "merge.tool" entry, use the
value 'ecmerge'
- If not already set, add the
"mergetool.ecmerge.path" value with the path of
ECMerge executable.
|
Perforce
|
Here are the steps to configure P4Win (2000.1
release or later) to use Ellié Computing Merge for
file comparison and merging:
- Open the
Settings/Options menu.
-
Select the
Files/Diff category.
- Select the
User supplied Diff application
radio button.
- Click o the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory.
- Check the
Optional args
option and enter the following string
%1 %2 --mode=diff2
--title1="%L" --title2="%R"
- Select the
Files/Merge tab.
- Select the
User supplied Diff application
radio button.
- Click o the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory.
- Check the
Optional args
option and enter the following string
%1 %2 %3 --mode=merge3
--to="%4" --title1="%Y" --title2="%T"
|
QVCS
|
Here are the steps to configure QVCS 3.10 to use
Ellié Computing Merge for file comparison:
- Open the
Admin/Preferences... menu
- Select the "
Utilities" tab
- In the
Visual Compare Utility Command Line
type the path to
ecmerge.exe in the Ellié Computing
Merge directory. Add the following parameters:
"%s" "%s"
--mode=diff2
|
Seapine
Surround SCM
|
Here are the steps to configure Surround SCM to use
Ellié Computing Merge for file comparison and
merging:
- Choose
Tools/User Options
- Select the
Diff/Merge category.
- Select
Use selected diff/merge
utilities
- In the
2-way diff utility
, click on the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following parameters:
%1 %2
--mode=diff2
- In the
3-way diff utility
, click on the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following parameters:
%3 %1 %2
--mode=diff3
-
In the
2-way merge utility
, click on the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following
parameters:
%1 %2 --mode=merge2
--to="%2"
-
In the
3-way merge utility
, click on the
Browse...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following
parameters:
%3 %1 %2 --mode=merge3
--to="%2"
- Uncheck
Use diff/merge utility to compare binary
files
.
|
Source OffSite
|
Here are the steps to configure SourceOffSite to use
Ellié Computing Merge for file comparison and
merging:
- In the Client's application, choose the
Tools/Options menu
- Select the
External Programs tab
- Enter the path to ecmerge
.exe in the Ellié Computing Merge
directory in the "
Application for comparing files
", "
Application for comparing directories
", and "
Application for merging files
" fields.
|
SourceTree
|
To configure ECMerge as the comparison and merge
tool in SourceTree:
- Open SourceTree, enter Tools/Options menu
- Select the Diff tab
- In External Diff / Merge, enter the path of
ECMerge for Diff Command fields
- In Diff Command Parameters, enter:
--mode=diff2 $LOCAL $REMOTE
- In Merge Command Parameters, enter:
--mode=merge3 $BASE $LOCAL $REMOTE
--to=$MERGED
- Press OK
|
StarTeam
|
Here are the steps to configure StarTeam to use
Ellié Computing Merge for file comparison and
merging:
- Select
Tools/Personal Options from the menu
bar.
- Choose the
Files tab.
- Click on the
Alternate Applications
button.
- Select the
Merge Utility check box.
- Type the path to or browse for
ecmerge.exe in the Ellié Computing
Merge directory in the text box
- 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
|
Team Coherence
|
Here are the steps to configure Team Coherence to
use Ellié Computing Merge for file comparison and
merging:
- Open the
Tools/Options menu
- Click on the
Difference Viewers category
- Click on the
...
button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following parameters:
$LF $RF --mode=diff2
--title1="$LD" --title2="$RD"
|
Team Foundation Server
|
Here are the steps to configure Microsoft Team
Foundation Server to use Ellié Computing Merge for
file comparison and merging:
- Open the
File/Options... menu
- Expand
Source Control in the tree view
- Click on "
Visual Studio Team Foundation Server
" in the tree view
- Click on the
Configure User Tools...
button
- Click on the
Add...
button to create each new entry:
Extension
|
.*
|
.*
|
Operation
|
Compare
|
Merge
|
Command
|
path_to_ecmerge.exe
in the Ellié Computing Merge directory |
Arguments
|
--mode=diff2 %1 %2
--title1=%6 --title2=%7
|
--mode=merge3
%3 %1 %2 --to=%4 --title0=%8 --title1=%6
--title2=%7 --to-title=%9
|
|
TortoiseSVN
|
Here are the steps to configure Tortoise SVN to use
Ellié Computing Merge for file comparison:
- Open the TortoiseSVN
Settings dialog,
- Click on the
External Programs/Diff Viewer page.
- Select "
External" option
- Clik on the
... button and select the file
ecmerge.exe in the Ellié Computing
Merge directory. Add the following parameters:
%base %mine
--mode=diff2 --title1="%bname"
--title2="%yname" --flags1=no_mru
--flags2=no_mru --flags0=no_mru
Here are the steps to configure Tortoise SVN to use
Ellié Computing Merge for file merging:
- Open the TortoiseSVN
Settings dialog,
- Click on the
External Programs/Merge Tool page.
- Select "
External" option
- Clik on the
... button and select the file
ecmerge.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"
--lockedui --flags1=no_mru --flags2=no_mru
--flags0=no_mru --to-flags=no_mru
|
VersionMaster |
Here are the steps to configure VersionMaster 2.0 to
use Ellié Computing Merge for file comparison:
- Open the
Tools/Options menu
- Select the "
Visual Differencing" tab
- Select the "
Use Customer Visual Differencer
" choice
- Click o the
...
button and select the file ecmerge
.exe in the Ellié Computing Merge
directory.
|
Visual SourceSafe
|
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:
- Open the
Tools/Options... menu
- Select the
Custom Editors page
- In the
Editors list, add 2 new entries:
File Extension
|
Operation
|
Command Line
|
.*
|
File Difference
|
path_to_ecmerge.exe
--mode=diff2 %1 %2
|
.*
|
File Merge
|
path_to_ecmerge.exe
--mode=merge3 %3 %1 %2 --to="%4"
|
Visual SourceSafe 6.0 and earlier does not support
external difference utilities.
|