public enum ConflictSide extends java.lang.Enum<ConflictSide>
Enum Constant and Description |
---|
BASE
Base version before modification
|
MERGED
Result of the merge
|
MINE
Locally modified version
|
THEIRS
Repository version
|
Modifier and Type | Method and Description |
---|---|
static ConflictSide |
valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static ConflictSide[] |
values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
public static final ConflictSide MINE
public static final ConflictSide THEIRS
public static final ConflictSide BASE
public static final ConflictSide MERGED
public static ConflictSide[] values()
for (ConflictSide c : ConflictSide.values()) System.out.println(c);
public static ConflictSide valueOf(java.lang.String name)
name
- the name of the enum constant to be returned.java.lang.IllegalArgumentException
- if this enum type has no constant with the specified namejava.lang.NullPointerException
- if the argument is null