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 necessaryMethods in org.eclipse.jgit.merge that return ThreeWayMergerModifier and TypeMethodDescriptionStrategyRecursive.newMerger
(ObjectInserter inserter, Config config) StrategyRecursive.newMerger
(Repository db) StrategyRecursive.newMerger
(Repository db, boolean inCore) StrategyResolve.newMerger
(ObjectInserter inserter, Config config) StrategyResolve.newMerger
(Repository db) StrategyResolve.newMerger
(Repository db, boolean inCore) StrategySimpleTwoWayInCore.newMerger
(ObjectInserter inserter, Config config) StrategySimpleTwoWayInCore.newMerger
(Repository db) StrategySimpleTwoWayInCore.newMerger
(Repository db, boolean inCore) abstract ThreeWayMerger
ThreeWayMergeStrategy.newMerger
(Repository db) abstract ThreeWayMerger
ThreeWayMergeStrategy.newMerger
(Repository db, boolean inCore)