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

Packages that use ThreeWayMergeStrategy

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

Uses of ThreeWayMergeStrategy in org.eclipse.jgit.merge

Subclasses of ThreeWayMergeStrategy in org.eclipse.jgit.merge

Modifier and Type	Class	Description
class	StrategyRecursive	A three-way merge strategy performing a content-merge if necessary
class	StrategyResolve	A three-way merge strategy performing a content-merge if necessary
class	StrategySimpleTwoWayInCore	Merges two commits together in-memory, ignoring any working directory.

Fields in org.eclipse.jgit.merge declared as ThreeWayMergeStrategy

Modifier and Type	Field	Description
static ThreeWayMergeStrategy	MergeStrategy.RECURSIVE	Recursive strategy to merge paths.
static ThreeWayMergeStrategy	MergeStrategy.RESOLVE	Simple strategy to merge paths.
static ThreeWayMergeStrategy	MergeStrategy.SIMPLE_TWO_WAY_IN_CORE	Simple strategy to merge paths, without simultaneous edits.