diff options
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java')
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java deleted file mode 100644 index 0a5cd989c..000000000 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2003 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.team.tests.ccvs.core.subscriber; - -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.team.core.subscribers.MutableSyncInfoSet; -import org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction; - - -class TestMarkAsMergedAction extends SubscriberConfirmMergedAction { - public IRunnableWithProgress getRunnable(MutableSyncInfoSet syncSet) { - return super.getRunnable(syncSet); - } - protected boolean canRunAsJob() { - return false; - } -}
\ No newline at end of file |