Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java
index bd1aef62a..7ec91f5dd 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/sync/CatchupReleaseViewer.java
@@ -396,6 +396,7 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
//determine what other filters to apply based on current action states
switch (syncMode) {
case SyncView.SYNC_INCOMING:
+ case SyncView.SYNC_MERGE:
if (!showOnlyConflicts.isChecked()) {
filters |= CategoryFilter.SHOW_INCOMING;
}
@@ -406,7 +407,6 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
}
break;
case SyncView.SYNC_BOTH:
- case SyncView.SYNC_MERGE:
boolean conflictsOnly = showOnlyConflicts.isChecked();
//if showing only conflicts, don't allow these actions to happen
showIncoming.setEnabled(!conflictsOnly);

Back to the top