Uses of Class
org.eclipse.jgit.merge.ThreeWayMerger
-
Packages that use ThreeWayMerger Package Description org.eclipse.jgit.merge Content and commit history merge algorithms. -
-
Uses of ThreeWayMerger in org.eclipse.jgit.merge
Subclasses of ThreeWayMerger in org.eclipse.jgit.merge Modifier and Type Class Description class
RecursiveMerger
A three-way merger performing a content-merge if necessary across multiple bases using recursion This merger extends the resolve merger and does several things differently: - allow more than one merge base, up to a maximum - uses "Lists" instead of Arrays for chained types - recursively merges the merge bases together to compute a usable baseclass
ResolveMerger
A three-way merger performing a content-merge if necessaryMethods in org.eclipse.jgit.merge that return ThreeWayMerger Modifier and Type Method Description ThreeWayMerger
StrategyRecursive. newMerger(Repository db)
ThreeWayMerger
StrategyRecursive. newMerger(Repository db, boolean inCore)
ThreeWayMerger
StrategyResolve. newMerger(Repository db)
ThreeWayMerger
StrategyResolve. newMerger(Repository db, boolean inCore)
ThreeWayMerger
StrategySimpleTwoWayInCore. newMerger(Repository db)
ThreeWayMerger
StrategySimpleTwoWayInCore. newMerger(Repository db, boolean inCore)
abstract ThreeWayMerger
ThreeWayMergeStrategy. newMerger(Repository db)
abstract ThreeWayMerger
ThreeWayMergeStrategy. newMerger(Repository db, boolean inCore)
-