Package | Description |
---|---|
com.oracle.bmc.devops.model |
Modifier and Type | Method and Description |
---|---|
static DiffLineDetails.ConflictMarker |
DiffLineDetails.ConflictMarker.create(String key) |
DiffLineDetails.ConflictMarker |
DiffLineDetails.getConflictMarker()
Indicates whether a line in a conflicted section of the difference is from the base version,
the target version, or if its just a marker indicating the beginning, middle, or end of a
conflicted section.
|
static DiffLineDetails.ConflictMarker |
DiffLineDetails.ConflictMarker.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static DiffLineDetails.ConflictMarker[] |
DiffLineDetails.ConflictMarker.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
DiffLineDetails.Builder |
DiffLineDetails.Builder.conflictMarker(DiffLineDetails.ConflictMarker conflictMarker)
Indicates whether a line in a conflicted section of the difference is from the base
version, the target version, or if its just a marker indicating the beginning, middle, or
end of a conflicted section.
|
Constructor and Description |
---|
DiffLineDetails(Integer baseLine,
Integer targetLine,
String lineContent,
DiffLineDetails.ConflictMarker conflictMarker)
Deprecated.
|
Copyright © 2016–2024. All rights reserved.