Skip to main content
summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorStephane Bouchet2015-05-07 10:11:12 +0000
committerStephane Bouchet2015-12-16 13:50:49 +0000
commite846ffb0f21624687ae74bac4a366e95d584416c (patch)
tree9adf9c5c05241aa608bbc0b03753ab0959a46e51 /tests
parent8dc98e1046a5dc0ec196b3965eb45b9c57cb231d (diff)
downloadorg.eclipse.emf.diffmerge.core-e846ffb0f21624687ae74bac4a366e95d584416c.tar.gz
org.eclipse.emf.diffmerge.core-e846ffb0f21624687ae74bac4a366e95d584416c.tar.xz
org.eclipse.emf.diffmerge.core-e846ffb0f21624687ae74bac4a366e95d584416c.zip
Eclipse Team integration for DiffMerge
[466706] Support Local history [466427] Support Git Scm [482287] Support SVN Scm [482288] Support Perforce Scm Added support for local history, git, svn and perforce. Updated test model. Change-Id: I9b9929bbb5a74220619d4fce55b251efd18f8631 Signed-off-by: Stephane Bouchet <stephane.bouchet@intel.com> Bug: https://bugs.eclipse.org/466706
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements/plugin.xml10
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements/plugin.xml b/tests/org.eclipse.emf.diffmerge.tests.elements/plugin.xml
index 85356a6f..e5456b91 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements/plugin.xml
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements/plugin.xml
@@ -12,5 +12,15 @@
class="org.eclipse.emf.diffmerge.tests.elements.Elements.ElementsPackage"
genModel="model/Elements.genmodel"/>
</extension>
+ <extension
+ point="org.eclipse.core.contenttype.contentTypes">
+ <content-type
+ base-type="org.eclipse.emf.ecore.xmi"
+ file-extensions="elements"
+ id="org.eclipse.emf.diffmerge.tests.elements.content-type"
+ name="elements"
+ priority="normal">
+ </content-type>
+ </extension>
</plugin>

Back to the top