Package | Description |
---|---|
org.eclipse.jgit.merge |
Content and commit history merge algorithms.
|
Modifier and Type | Field and Description |
---|---|
protected MergeAlgorithm |
ResolveMerger.mergeAlgorithm
our merge algorithm
|
Modifier and Type | Method and Description |
---|---|
private static MergeAlgorithm |
ResolveMerger.getMergeAlgorithm(Config config) |