Package org.eclipse.jgit.merge

Class Summary
Merger Instance of a specific MergeStrategy for a single Repository.
MergeStrategy A method of combining two or more trees together to form an output tree.
StrategyOneSided Trivial merge strategy to make the resulting tree exactly match an input.
StrategySimpleTwoWayInCore Merges two commits together in-memory, ignoring any working directory.
ThreeWayMerger A merge of 2 trees, using a common base ancestor tree.
ThreeWayMergeStrategy A merge strategy to merge 2 trees, using a common base ancestor tree.