diff options
| author | Michael Valenta | 2006-01-19 03:35:06 +0000 |
|---|---|---|
| committer | Michael Valenta | 2006-01-19 03:35:06 +0000 |
| commit | 71da33e735aea37bce161659a7b7fdaf1125dd74 (patch) | |
| tree | 56a7a364254644257b21c8289ca5e30ee6691892 /bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers | |
| parent | 3369778cc900faf6aeba782c3174cb65a4e09624 (diff) | |
| download | eclipse.platform.team-71da33e735aea37bce161659a7b7fdaf1125dd74.tar.gz eclipse.platform.team-71da33e735aea37bce161659a7b7fdaf1125dd74.tar.xz eclipse.platform.team-71da33e735aea37bce161659a7b7fdaf1125dd74.zip | |
Bug 114751 [Merge API] Replace with Latest should use merge API
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers')
| -rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java index 3e2b3e98b..986bad8bb 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java @@ -47,7 +47,7 @@ public abstract class SubscriberMergeContext extends MergeContext { this.subscriber = subscriber; } - private static String getType(Subscriber subscriber) { + private static int getType(Subscriber subscriber) { return subscriber.getResourceComparator().isThreeWay() ? THREE_WAY : TWO_WAY; } |