Package | Description |
---|---|
org.eclipse.jgit.merge |
Modifier and Type | Class and Description |
---|---|
class |
ResolveMerger
A three-way merger performing a content-merge if necessary
|
Modifier and Type | Method and Description |
---|---|
ThreeWayMerger |
StrategyResolve.newMerger(Repository db) |
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db) |
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db) |
ThreeWayMerger |
StrategyResolve.newMerger(Repository db,
boolean inCore) |
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db,
boolean inCore) |
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db,
boolean inCore) |
Copyright © 2012. All Rights Reserved.