Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Method and Description |
---|---|
java.util.Iterator<MergeChunk> |
MergeResult.iterator() |
Modifier and Type | Method and Description |
---|---|
private void |
MergeFormatterPass.writeConflictChange(MergeChunk chunk) |
private void |
MergeFormatterPass.writeConflictMetadata(MergeChunk chunk) |
private void |
MergeFormatterPass.writeConflictStart(MergeChunk chunk) |