diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java index c0004f162..aa971e835 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/MergeAction.java @@ -22,9 +22,6 @@ import org.eclipse.team.internal.ccvs.ui.wizards.MergeWizard; public class MergeAction extends WorkspaceTraversalAction { - /* - * @see CVSAction#execute() - */ @Override public void execute(IAction action) { final Shell shell = getShell(); @@ -36,9 +33,6 @@ public class MergeAction extends WorkspaceTraversalAction { }); } - /* (non-Javadoc) - * @see org.eclipse.team.internal.ccvs.ui.actions.CVSAction#getId() - */ @Override public String getId() { return ICVSUIConstants.CMD_MERGE; |