Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.compare/plugin.xml11
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml5
2 files changed, 9 insertions, 7 deletions
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 63ae78afe..751f46aef 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- Copyright (c) 2001, 2011 IBM Corporation and others.
+ Copyright (c) 2001, 2012 IBM Corporation 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
@@ -233,12 +233,13 @@
</separator>
</menu>
<action
- label="%ReplaceFromHistoryAction.label"
- tooltip="%ReplaceFromHistoryAction.tooltip"
class="org.eclipse.compare.internal.ReplaceWithEditionAction"
- menubarPath="replaceWithMenu/replaceWithGroup"
enablesFor="1"
- id="replaceFromHistory">
+ helpContextId="org.eclipse.compare.replace_with_edition_action_context"
+ id="replaceFromHistory"
+ label="%ReplaceFromHistoryAction.label"
+ menubarPath="replaceWithMenu/replaceWithGroup"
+ tooltip="%ReplaceFromHistoryAction.tooltip">
</action>
<action
label="%ReplaceWithPreviousFromHistoryAction.label"
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index baa57778b..00ac35084 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- Copyright (c) 2001, 2011 IBM Corporation and others.
+ Copyright (c) 2001, 2012 IBM Corporation 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
@@ -167,10 +167,11 @@
tooltip="%CompareLocalHistory.tooltip"/>
<action
class="org.eclipse.team.internal.ui.history.ReplaceLocalHistory"
+ enablesFor="1"
+ helpContextId="org.eclipse.compare.replace_with_edition_action_context"
id="org.eclipse.team.ui.replaceLocalHistory"
label="%ReplaceLocalHistory.label"
menubarPath="replaceWithMenu/replaceWithGroup"
- enablesFor="1"
overrideActionId="replaceFromHistory"
tooltip="%ReplaceLocalHistory.tooltip"/>
<action

Back to the top