Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-08-26 10:39:05 -0400
committerMatthias Sohn2015-08-30 17:24:13 -0400
commit99cdec0cd3cce94f4ceb69364c715dfa81ee0edb (patch)
tree5fd22f25b4c9c4d787f0bfd05cb48ee6563f77c3 /org.eclipse.egit.core/plugin.xml
parent3a6a38c067ef807fe3898367c891029cf3611e17 (diff)
downloadegit-99cdec0cd3cce94f4ceb69364c715dfa81ee0edb.tar.gz
egit-99cdec0cd3cce94f4ceb69364c715dfa81ee0edb.tar.xz
egit-99cdec0cd3cce94f4ceb69364c715dfa81ee0edb.zip
Introduce a mergeStrategy extension point.
The new extension point can be used to implement and register custom merge strategies which can be used by EGit operations that require merge (merge, rebase, pull, revert, squash, stash, submodule update). Add a preference page to allow selection of the preferred merge strategy. Make sure that relevant operations use the preferred strategy. Bug: 418151 Change-Id: I4d455ce171cca13c780e72b8d27dd929b28c6b71 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.core/plugin.xml')
-rw-r--r--org.eclipse.egit.core/plugin.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/org.eclipse.egit.core/plugin.xml b/org.eclipse.egit.core/plugin.xml
index 31db1ac46..f7dcb5d28 100644
--- a/org.eclipse.egit.core/plugin.xml
+++ b/org.eclipse.egit.core/plugin.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<plugin>
+ <extension-point id="mergeStrategy" name="%MergeStrategy-extension-point.name" schema="schema/mergeStrategy.exsd"/>
<extension point="org.eclipse.core.runtime.preferences">
<initializer class="org.eclipse.egit.core.GitCorePreferenceInitializer"/>
</extension>

Back to the top