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

Class DefaultSVNMergerAction

java.lang.Object

org.tmatesoft.svn.core.internal.wc.DefaultSVNMergerAction

public class DefaultSVNMergerAction
extends java.lang.Object

Version:

1.3

Field Summary

Fields

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

Constructor Summary

Constructors

Modifier	Constructor	Description
private	DefaultSVNMergerAction()

Method Summary

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

MARK_CONFLICTED

public static final DefaultSVNMergerAction MARK_CONFLICTED

CHOOSE_BASE

public static final DefaultSVNMergerAction CHOOSE_BASE

CHOOSE_REPOSITORY

public static final DefaultSVNMergerAction CHOOSE_REPOSITORY

CHOOSE_WORKING

public static final DefaultSVNMergerAction CHOOSE_WORKING

MARK_RESOLVED

public static final DefaultSVNMergerAction MARK_RESOLVED

CHOOSE_MERGED_FILE

public static final DefaultSVNMergerAction CHOOSE_MERGED_FILE

CHOOSE_REPOSITORY_CONFLICTED

public static final DefaultSVNMergerAction CHOOSE_REPOSITORY_CONFLICTED

CHOOSE_WORKING_CONFLICTED

public static final DefaultSVNMergerAction CHOOSE_WORKING_CONFLICTED

Constructor Detail

DefaultSVNMergerAction

private DefaultSVNMergerAction()