Package | Description |
---|---|
org.eclipse.jgit.merge |
Modifier and Type | Class and Description |
---|---|
class |
ResolveMerger
A three-way merger performing a content-merge if necessary
|
class |
ThreeWayMerger
A merge of 2 trees, using a common base ancestor tree.
|
Modifier and Type | Method and Description |
---|---|
abstract Merger |
MergeStrategy.newMerger(Repository db)
Create a new merge instance.
|
Merger |
StrategyOneSided.newMerger(Repository db) |
abstract Merger |
MergeStrategy.newMerger(Repository db,
boolean inCore)
Create a new merge instance.
|
Merger |
StrategyOneSided.newMerger(Repository db,
boolean inCore) |
Copyright © 2012. All Rights Reserved.