diff options
| author | Philipp Thun | 2011-03-06 21:38:16 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-03-06 21:38:16 +0000 |
| commit | 0e125613a1ed787ecbff20f49d610729d7479371 (patch) | |
| tree | f85fb032beaa11e72c47b4a998ce06473ea85ccb | |
| parent | 6bb6b8e13956c7f42ac7d7ab5b8ad12225282dbc (diff) | |
| download | egit-0e125613a1ed787ecbff20f49d610729d7479371.tar.gz egit-0e125613a1ed787ecbff20f49d610729d7479371.tar.xz egit-0e125613a1ed787ecbff20f49d610729d7479371.zip | |
Re-enable MergeCommand for RefNode and TagNode
The org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand
has been (accidentally) disabled for RefNodes and TagNodes. Thus the
'Merge' entry in the context menu on a branch within the repositories
view had been disabled. This fix enables the entry again.
Change-Id: I345401809dde9c2db0ef8326862012fa3a9e98a0
Signed-off-by: Philipp Thun <philipp.thun@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index c4b4afa78d..dd25ef92f5 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -924,9 +924,17 @@ </count> <and> <iterate> - <instanceof - value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode"> - </instanceof> + <or> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.TagNode"> + </instanceof> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.RefNode"> + </instanceof> + <instanceof + value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode"> + </instanceof> + </or> </iterate> </and> </and> |