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 and 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 base
class	ResolveMerger A three-way merger performing a content-merge if necessary

Methods in org.eclipse.jgit.merge that return ThreeWayMerger

Modifier and Type	Method and Description
ThreeWayMerger	StrategyRecursive.newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
ThreeWayMerger	StrategySimpleTwoWayInCore.newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
ThreeWayMerger	StrategyResolve.newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
ThreeWayMerger	StrategyRecursive.newMerger(Repository db) Create a new merge instance.
ThreeWayMerger	StrategySimpleTwoWayInCore.newMerger(Repository db) Create a new merge instance.
ThreeWayMerger	StrategyResolve.newMerger(Repository db) Create a new merge instance.
abstract ThreeWayMerger	ThreeWayMergeStrategy.newMerger(Repository db) Create a new merge instance.
ThreeWayMerger	StrategyRecursive.newMerger(Repository db, boolean inCore) Create a new merge instance.
ThreeWayMerger	StrategySimpleTwoWayInCore.newMerger(Repository db, boolean inCore) Create a new merge instance.
ThreeWayMerger	StrategyResolve.newMerger(Repository db, boolean inCore) Create a new merge instance.
abstract ThreeWayMerger	ThreeWayMergeStrategy.newMerger(Repository db, boolean inCore) Create a new merge instance.