diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/plugin.xml')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/plugin.xml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml index ff628813c..378fa58a1 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml +++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml @@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <!-- - Copyright (c) 2012, 2016 Obeo and others. + Copyright (c) 2012, 2017 Obeo and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -13,7 +13,7 @@ Stefan Dirix - bugs 456699, 474723 Michael Borkowski - bug 467191 Simon Delisle - bug 495753 - Philip Langer - bug 508855 + Philip Langer - bug 508855, 527567 Martin fleck - bug 512677 --> @@ -113,6 +113,21 @@ id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.TextFallbackCompareViewer" label="%emf.compare.fallback.textcompare"> </viewer> + <viewer + class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.property.PropertyContentMergeViewerCreator" + extensions= + "org.eclipse.emf.compare.rcp.ui.fallbackText, + org.eclipse.emf.compare.rcp.ui.eTreeDiff, + org.eclipse.emf.compare.rcp.ui.eMatch, + org.eclipse.emf.compare.rcp.ui.eResourceDiff, + org.eclipse.emf.compare.rcp.ui.eListDiff, + org.eclipse.emf.compare.rcp.ui.eTextDiff, + org.eclipse.emf.compare.rcp.ui.eNoDiff, + org.eclipse.emf.compare.rcp.ui.eNoVisibleItem, + org.eclipse.emf.compare.rcp.ui.eOnlyPseudoConflicts" + id="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.property.PropertyContentMergeViewerCreator" + label="Properties Compare"> + </viewer> <contentTypeBinding contentTypeId="org.eclipse.emf.ecore.xmi" contentMergeViewerId="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.WaitViewer"> |