Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-03-05 11:09:35 -0500
committerjames2002-03-05 11:09:35 -0500
commita47f5c4da7ed47368b0964d427d4891bcf2df092 (patch)
tree11405e1bd0433064c2520fd9b6b10a525d9dedfc
parent5a02c18dc5f47a924c76136f9409595b2bf60fd8 (diff)
downloadeclipse.platform.team-a47f5c4da7ed47368b0964d427d4891bcf2df092.tar.gz
eclipse.platform.team-a47f5c4da7ed47368b0964d427d4891bcf2df092.tar.xz
eclipse.platform.team-a47f5c4da7ed47368b0964d427d4891bcf2df092.zip
10770: Compilation error in MergeAction
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
index 3e222c997..6dc9e1dcb 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/MergeAction.java
@@ -102,7 +102,7 @@ abstract class MergeAction extends Action {
final SyncSet[] result = new SyncSet[1];
WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
public void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
- result[0] = run(set, monitor);
+ result[0] = MergeAction.this.run(set, monitor);
}
};
try {

Back to the top