diff options
| author | Mathieu Cartaud | 2015-09-18 09:06:47 +0000 |
|---|---|---|
| committer | Axel Richard | 2015-09-23 13:00:45 +0000 |
| commit | 32d90bb986c9978fc5976596abc909196076bfd8 (patch) | |
| tree | dfdd4e1ed9d71c1fcbf196d652e8838482a60317 /packaging | |
| parent | 906d0cc7d2eb527b375c26c3654d3e030c482cc3 (diff) | |
| download | org.eclipse.emf.compare-32d90bb986c9978fc5976596abc909196076bfd8.tar.gz org.eclipse.emf.compare-32d90bb986c9978fc5976596abc909196076bfd8.tar.xz org.eclipse.emf.compare-32d90bb986c9978fc5976596abc909196076bfd8.zip | |
Model Merge Tool + classes to do model merges with EGit
Introduce classes to be able to perform merges interacting with EGit
from code hosted by EMFCompare.
This will allow us to abandon reviews 22674 and 22672 in EGit.
Change-Id: I28e96903c09206f34b510f3c08ec93d7fb91eba0
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/org.eclipse.emf.compare.egit-feature/feature.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packaging/org.eclipse.emf.compare.egit-feature/feature.xml b/packaging/org.eclipse.emf.compare.egit-feature/feature.xml index d6db47b26..ebb1fc7c0 100644 --- a/packaging/org.eclipse.emf.compare.egit-feature/feature.xml +++ b/packaging/org.eclipse.emf.compare.egit-feature/feature.xml @@ -31,4 +31,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.emf.compare.egit.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> |