Uses of Class
org.tmatesoft.svn.core.internal.wc.DefaultSVNMergerAction
Packages that use DefaultSVNMergerAction
-
Uses of DefaultSVNMergerAction in org.tmatesoft.svn.core.internal.wc
Fields in org.tmatesoft.svn.core.internal.wc declared as DefaultSVNMergerActionModifier and TypeFieldDescriptionstatic final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_BASE
static final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_MERGED_FILE
static final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_REPOSITORY
static final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_REPOSITORY_CONFLICTED
static final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_WORKING
static final DefaultSVNMergerAction
DefaultSVNMergerAction.CHOOSE_WORKING_CONFLICTED
static final DefaultSVNMergerAction
DefaultSVNMergerAction.MARK_CONFLICTED
static final DefaultSVNMergerAction
DefaultSVNMergerAction.MARK_RESOLVED
Methods in org.tmatesoft.svn.core.internal.wc that return DefaultSVNMergerActionModifier and TypeMethodDescriptionprotected DefaultSVNMergerAction
DefaultSVNMerger.getMergeAction
(SVNMergeFileSet files, SVNMergeResult mergeResult)