diff options
Diffstat (limited to 'plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java')
| -rw-r--r-- | plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java index def31a2c3e74..5b2e0ca97589 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/QuickMergeInteraction.java @@ -35,10 +35,6 @@ import java.util.List; */ public interface QuickMergeInteraction { void setTitle(@NotNull final String title); - /** - * @return {@link com.intellij.openapi.ui.Messages.CANCEL} - cancel, - * {@link com.intellij.openapi.ui.Messages.OK} - merge all, {@link com.intellij.openapi.ui.Messages.NO} - select revisions to merge - */ QuickMergeContentsVariants selectMergeVariant(); boolean shouldContinueSwitchedRootFound(); |