Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-03-19 15:36:24 -0500
committerjames2002-03-19 15:36:24 -0500
commit2b70a8a2a2451e0f42b13e1e838b17f04ff81a44 (patch)
tree0dd069dbab506878dfe8c72d4f23bafd5a093606
parentb425113deb81f68d50f7545cc1f23522f694f7b9 (diff)
downloadeclipse.platform.team-2b70a8a2a2451e0f42b13e1e838b17f04ff81a44.tar.gz
eclipse.platform.team-2b70a8a2a2451e0f42b13e1e838b17f04ff81a44.tar.xz
eclipse.platform.team-2b70a8a2a2451e0f42b13e1e838b17f04ff81a44.zip
Add Override Update to the merge viewer
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
index 01be6ee7c..8f2231307 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java
@@ -220,8 +220,10 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer {
break;
case SyncView.SYNC_MERGE:
updateMergeAction.update(SyncView.SYNC_INCOMING);
+ forceUpdateAction.update(SyncView.SYNC_INCOMING);
updateWithJoinAction.update(SyncView.SYNC_INCOMING);
manager.add(updateMergeAction);
+ manager.add(forceUpdateAction);
manager.add(updateWithJoinAction);
break;
}

Back to the top