org.eclipse.jgit.merge

Classes

• MergeAlgorithm
• MergeChunk
• MergeFormatter
• MergeMessageFormatter
• Merger
• MergeResult
• MergeStrategy
• RecursiveMerger
• ResolveMerger
• SquashMessageFormatter
• StrategyOneSided
• StrategyRecursive
• StrategyResolve
• StrategySimpleTwoWayInCore
• ThreeWayMerger
• ThreeWayMergeStrategy

Enums

• MergeChunk.ConflictState
• ResolveMerger.MergeFailureReason