Ellié Computing Merge can be integrated with most of the Software Configuration Management (SCM) solutions that allow a external difference/merging utility to be used.
You see hereafter the list of Version Control systems we have been told to be integrated with successfully.
NOTA BENE: for stability amongst platform and computers of a given network and that "in time", you can use --factory to get factory settings (it used to be the default behaviour up to 2.1.77). You can also refer to a .ECMT file on the network through --doc-settings.
What is the path of ECMerge?
~/bin/ecmerge
and
/usr/local/bin/ecmerge
if you installed with a
packagec:\program files (x86)\ellie
computing\merge\ecmerge.exe
/Applications/ECMerge.app/Contents/MacOS/guimerge
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:
|
||||||||||||
ClearCase
![]() |
There are two big cases:
|
||||||||||||
FreeVCS
![]() |
Here are the steps to configure FreeVCS 2.2 to use Ellié Computing Merge for file comparison:
|
||||||||||||
GIT
![]() |
GIT contains a pre-defined diff/merge tool configuration for ECMerge called 'ecmerge'.
|
||||||||||||
Perforce
![]() |
Here are the steps to configure P4Win (2000.1 release or later) to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
QVCS
![]() |
Here are the steps to configure QVCS 3.10 to use Ellié Computing Merge for file comparison:
|
||||||||||||
Seapine
Surround SCM
![]() |
Here are the steps to configure Surround SCM to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
Source OffSite
![]() |
Here are the steps to configure SourceOffSite to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
SourceTree
![]() |
To configure ECMerge as the comparison and merge tool in SourceTree:
|
||||||||||||
StarTeam
![]() |
Here are the steps to configure StarTeam to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
Team Coherence
![]() |
Here are the steps to configure Team Coherence to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
Team Foundation Server
![]() |
Here are the steps to configure Microsoft Team Foundation Server to use Ellié Computing Merge for file comparison and merging:
|
||||||||||||
TortoiseSVN
![]() |
Here are the steps to configure Tortoise SVN to use Ellié Computing Merge for file comparison:
Here are the steps to configure Tortoise SVN to use Ellié Computing Merge for file merging:
|
||||||||||||
VersionMaster
![]() |
Here are the steps to configure VersionMaster 2.0 to use Ellié Computing Merge for file comparison:
|
||||||||||||
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:
Visual SourceSafe 6.0 and earlier does not support external difference utilities. |
If your
Source Code Control product cannot be configured to have custom
diff/merge software, you can still use Ellié
Computing Merge as an independant application, outside of the
Change Management software. To achieve this, you just need to
get local copies of the file versions you wish to compare or
merge and open them (from the command line, the Windows
contextual menu, or from within Ellié Computing Merge
interface once launched).
Do not
hesitate to contact us to get help about integrating Ellié
Computing Merge in you Software Configuration Management
solution, or if you do not see your SCM system in this
page.
If you
managed to integrate Ellié Computing Merge with your
Version Control, or if the mentionned information is not exact,
you can contact us (
info@elliecomputing.com)
so as to update this table. Please give us all the needed steps
for configuring Ellié Computing Merge as the default
Diff/Merge tool in your Version Control, this way we
will include them in the above table and share the information
with other customers.
Legacy
These systems are not supported anymore by their respective vendors, we will continue to support the integration and plug-ins until next major version.
SCM Tool | Description |
CS-RCS |
Here are the steps to configure CS-RCS to use Ellié Computing Merge for file comparison and merging:
(It seems that ComponentSoftware ceased its activities) |
Evolution |
The options to control this are under the View / Options menu. Using the Advanced button in the Options dialog will allow you to configure any command line parameters necessary to control the way Ellié Computing Merge is called. (It seems that IonForge ceased its activities) |