Uses of Class
org.eclipse.jgit.merge.MergeChunk.ConflictState

Packages that use MergeChunk.ConflictState

Package	Description
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

Modifier and Type	Method and Description
MergeChunk.ConflictState	MergeChunk.getConflictState() Get the state of this chunk.
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

Modifier and Type	Method and 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.

Constructors in org.eclipse.jgit.merge with parameters of type MergeChunk.ConflictState

Constructor and Description
MergeChunk(int sequenceIndex, int begin, int end, MergeChunk.ConflictState conflictState) Creates a new empty MergeChunk