Uses of Class
org.eclipse.jgit.merge.Merger

Packages that use Merger

Package	Description
org.eclipse.jgit.merge	Content and commit history merge algorithms.

Uses of Merger in org.eclipse.jgit.merge

Subclasses of Merger 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
class	ThreeWayMerger A merge of 2 trees, using a common base ancestor tree.

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

Modifier and Type	Method and Description
Merger	StrategyOneSided.newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
abstract Merger	MergeStrategy.newMerger(ObjectInserter inserter, Config config) Create a new merge instance.
Merger	StrategyOneSided.newMerger(Repository db) Create a new merge instance.
abstract Merger	MergeStrategy.newMerger(Repository db) Create a new merge instance.
Merger	StrategyOneSided.newMerger(Repository db, boolean inCore) Create a new merge instance.
abstract Merger	MergeStrategy.newMerger(Repository db, boolean inCore) Create a new merge instance.