public static enum SVNUtil.ConflictDisplayStyle extends java.lang.Enum<SVNUtil.ConflictDisplayStyle>
Enum Constant and Description |
---|
latest
Just display latest, with no markers.
|
modified
Just display modified, with no markers.
|
modified_latest
Display modified and latest, with conflict markers.
|
modified_original_latest
Display modified, original, and latest, with conflict markers.
|
only_conflicts
Like
modified_original_latest , but
only showing conflicts. |
resolved_modified_latest
Like
modified_latest , but with an extra effort
to identify common sequences between modified and latest. |
Modifier and Type | Method and Description |
---|---|
static SVNUtil.ConflictDisplayStyle |
valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static SVNUtil.ConflictDisplayStyle[] |
values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
public static final SVNUtil.ConflictDisplayStyle modified_latest
public static final SVNUtil.ConflictDisplayStyle resolved_modified_latest
modified_latest
, but with an extra effort
to identify common sequences between modified and latest.public static final SVNUtil.ConflictDisplayStyle modified_original_latest
public static final SVNUtil.ConflictDisplayStyle modified
public static final SVNUtil.ConflictDisplayStyle latest
public static final SVNUtil.ConflictDisplayStyle only_conflicts
modified_original_latest
, but
only showing conflicts.public static SVNUtil.ConflictDisplayStyle[] values()
for (SVNUtil.ConflictDisplayStyle c : SVNUtil.ConflictDisplayStyle.values()) System.out.println(c);
public static SVNUtil.ConflictDisplayStyle 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