|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use MergeChunk.ConflictState | |
|---|---|
| org.eclipse.jgit.merge | Content and commit history merge algorithms. |
| Uses of MergeChunk.ConflictState in org.eclipse.jgit.merge |
|---|
| Methods in org.eclipse.jgit.merge that return MergeChunk.ConflictState | |
|---|---|
MergeChunk.ConflictState |
MergeChunk.getConflictState()
|
static MergeChunk.ConflictState |
MergeChunk.ConflictState.valueOf(String name)
Returns the enum constant of this type with the specified name. |
static MergeChunk.ConflictState[] |
MergeChunk.ConflictState.values()
Returns an array containing the constants of this enum type, in the order they are declared. |
| Methods in org.eclipse.jgit.merge with parameters of type MergeChunk.ConflictState | |
|---|---|
void |
MergeResult.add(int srcIdx,
int begin,
int end,
MergeChunk.ConflictState conflictState)
Adds a new range from one of the merged sequences or from the common predecessor. |
| Constructors in org.eclipse.jgit.merge with parameters of type MergeChunk.ConflictState | |
|---|---|
MergeChunk(int sequenceIndex,
int begin,
int end,
MergeChunk.ConflictState conflictState)
Creates a new empty MergeChunk |
|
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||