Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-04-18 13:20:48 -0400
committerAndre Weinand2004-04-18 13:20:48 -0400
commitdfaea77b815c7e37741a050baf9eef2be8289628 (patch)
tree7ed0d1657b266ff9975744c456646597503d73d0 /bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
parent830ada75ca822c67d26d54337576e678a0aa639a (diff)
downloadeclipse.platform.team-dfaea77b815c7e37741a050baf9eef2be8289628.tar.gz
eclipse.platform.team-dfaea77b815c7e37741a050baf9eef2be8289628.tar.xz
eclipse.platform.team-dfaea77b815c7e37741a050baf9eef2be8289628.zip
first cut of #54091
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml')
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml13
1 files changed, 13 insertions, 0 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index 0f490acfc..163a0fd83 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -25,6 +25,7 @@
<!-- Compare extension point definitions -->
+ <extension-point id="streamMergers" name="%streamMergers" schema="schema/streamMergers.exsd"/>
<extension-point id="structureCreators" name="%structureCreators" schema="schema/structureCreators.exsd"/>
<extension-point id="structureMergeViewers" name="%structureMergeViewers" schema="schema/structureMergeViewers.exsd"/>
<extension-point id="contentMergeViewers" name="%contentMergeViewers" schema="schema/contentMergeViewers.exsd"/>
@@ -306,6 +307,16 @@
</action>
</objectContribution>
</extension>
+
+ <extension
+ point="org.eclipse.compare.streamMergers">
+ <structureCreator
+ extensions="txt"
+ class="org.eclipse.compare.internal.merge.TextMerger"
+ id="org.eclipse.compare.internal.merge.TextMerger">
+ </structureCreator>
+ </extension>
+
<extension
point="org.eclipse.compare.structureCreators">
<structureCreator
@@ -314,6 +325,7 @@
id="org.eclipse.compare.ZipFileStructureCreator">
</structureCreator>
</extension>
+
<extension
point="org.eclipse.compare.contentMergeViewers">
<viewer
@@ -332,6 +344,7 @@
id="org.eclipse.compare.ImageMergeViewerCreator">
</viewer>
</extension>
+
<extension
point="org.eclipse.compare.contentViewers">
<viewer

Back to the top