Uses of Class
org.eclipse.jgit.merge.ThreeWayMerger
Packages that use ThreeWayMerger
-
Uses of ThreeWayMerger in org.eclipse.jgit.merge
Subclasses of ThreeWayMerger in org.eclipse.jgit.mergeModifier and TypeClassDescriptionclass
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
A three-way merger performing a content-merge if necessaryprivate static class
Methods in org.eclipse.jgit.merge that return ThreeWayMergerModifier and TypeMethodDescriptionStrategyRecursive.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.StrategyRecursive.newMerger
(Repository db) Create a new merge instance.StrategyRecursive.newMerger
(Repository db, boolean inCore) Create a new merge instance.StrategyResolve.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.StrategyResolve.newMerger
(Repository db) Create a new merge instance.StrategyResolve.newMerger
(Repository db, boolean inCore) Create a new merge instance.StrategySimpleTwoWayInCore.newMerger
(ObjectInserter inserter, Config config) Create a new merge instance.StrategySimpleTwoWayInCore.newMerger
(Repository db) Create a new merge instance.StrategySimpleTwoWayInCore.newMerger
(Repository db, boolean inCore) Create a new merge instance.abstract ThreeWayMerger
ThreeWayMergeStrategy.newMerger
(Repository db) Create a new merge instance.abstract ThreeWayMerger
ThreeWayMergeStrategy.newMerger
(Repository db, boolean inCore) Create a new merge instance.