|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use ThreeWayMerger | |
---|---|
org.eclipse.jgit.merge |
Uses of ThreeWayMerger in org.eclipse.jgit.merge |
---|
Subclasses of ThreeWayMerger in org.eclipse.jgit.merge | |
---|---|
class |
ResolveMerger
A three-way merger performing a content-merge if necessary |
Methods in org.eclipse.jgit.merge that return ThreeWayMerger | |
---|---|
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db)
|
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db)
|
ThreeWayMerger |
StrategyResolve.newMerger(Repository db)
|
ThreeWayMerger |
StrategySimpleTwoWayInCore.newMerger(Repository db,
boolean inCore)
|
abstract ThreeWayMerger |
ThreeWayMergeStrategy.newMerger(Repository db,
boolean inCore)
|
ThreeWayMerger |
StrategyResolve.newMerger(Repository db,
boolean inCore)
|
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |