Uses of Class
org.tmatesoft.svn.core.internal.wc.DefaultSVNMergerAction

Packages that use DefaultSVNMergerAction

Package	Description
org.tmatesoft.svn.core.internal.wc

Uses of DefaultSVNMergerAction in org.tmatesoft.svn.core.internal.wc

Fields in org.tmatesoft.svn.core.internal.wc declared as DefaultSVNMergerAction

Modifier and Type	Field	Description
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_BASE
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_MERGED_FILE
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_REPOSITORY
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_REPOSITORY_CONFLICTED
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_WORKING
static DefaultSVNMergerAction	DefaultSVNMergerAction.CHOOSE_WORKING_CONFLICTED
static DefaultSVNMergerAction	DefaultSVNMergerAction.MARK_CONFLICTED
static DefaultSVNMergerAction	DefaultSVNMergerAction.MARK_RESOLVED

Methods in org.tmatesoft.svn.core.internal.wc that return DefaultSVNMergerAction

Modifier and Type	Method	Description
protected DefaultSVNMergerAction	DefaultSVNMerger.getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult)