Class DefaultSVNMergerAction
java.lang.Object
org.tmatesoft.svn.core.internal.wc.DefaultSVNMergerAction
public class DefaultSVNMergerAction
extends java.lang.Object
- Version:
- 1.3
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
static final DefaultSVNMergerAction
-
Constructor Summary
Constructors -
Method Summary
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
-
Field Details
-
MARK_CONFLICTED
-
CHOOSE_BASE
-
CHOOSE_REPOSITORY
-
CHOOSE_WORKING
-
MARK_RESOLVED
-
CHOOSE_MERGED_FILE
-
CHOOSE_REPOSITORY_CONFLICTED
-
CHOOSE_WORKING_CONFLICTED
-
-
Constructor Details
-
DefaultSVNMergerAction
private DefaultSVNMergerAction()
-