diff options
| author | Stefan Lay | 2010-09-09 12:42:04 +0000 |
|---|---|---|
| committer | Code Review | 2010-09-09 12:42:04 +0000 |
| commit | e54458d7514ad545c428c8793f8c183e77c0968a (patch) | |
| tree | a836485d83746fb7ce4798fbe6188dce4e71a9a7 /org.eclipse.egit.ui | |
| parent | 9e05b34b5a973a15fcd0ee11b85b2e97d0bd26ab (diff) | |
| parent | 729cc9fc0b7c84518b6a1d3e031a1a881c48ef59 (diff) | |
| download | egit-e54458d7514ad545c428c8793f8c183e77c0968a.tar.gz egit-e54458d7514ad545c428c8793f8c183e77c0968a.tar.xz egit-e54458d7514ad545c428c8793f8c183e77c0968a.zip | |
Merge "Resolve handler conflict for merge command"
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/plugin.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml index b7d444e0ce..a1c1379162 100644 --- a/org.eclipse.egit.ui/plugin.xml +++ b/org.eclipse.egit.ui/plugin.xml @@ -1976,7 +1976,8 @@ class="org.eclipse.egit.ui.internal.repository.tree.command.MergeCommand" commandId="org.eclipse.egit.ui.RepositoriesViewMerge"> <activeWhen> - <iterate> + <iterate + ifEmpty="false"> <or> <instanceof value="org.eclipse.egit.ui.internal.repository.tree.RepositoryNode"> @@ -1991,7 +1992,8 @@ class="org.eclipse.egit.ui.internal.actions.MergeAction" commandId="org.eclipse.egit.ui.RepositoriesViewMerge"> <activeWhen> - <iterate> + <iterate + ifEmpty="false"> <instanceof value="org.eclipse.core.resources.IProject"> </instanceof> |