Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method | Description |
---|---|---|
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.
|
Modifier and Type | Method | Description |
---|---|---|
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.
|
Constructor | Description |
---|---|
MergeChunk(int sequenceIndex,
int begin,
int end,
MergeChunk.ConflictState conflictState) |
Creates a new empty MergeChunk
|
Copyright © 2018. All rights reserved.