public class DefaultSVNMergerAction
extends java.lang.Object
Modifier and Type | Field and 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 |
public static final DefaultSVNMergerAction MARK_CONFLICTED
public static final DefaultSVNMergerAction CHOOSE_BASE
public static final DefaultSVNMergerAction CHOOSE_REPOSITORY
public static final DefaultSVNMergerAction CHOOSE_WORKING
public static final DefaultSVNMergerAction MARK_RESOLVED
public static final DefaultSVNMergerAction CHOOSE_MERGED_FILE
public static final DefaultSVNMergerAction CHOOSE_REPOSITORY_CONFLICTED
public static final DefaultSVNMergerAction CHOOSE_WORKING_CONFLICTED
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.