Uses of Interface
org.eclipse.team.core.diff.IThreeWayDiff

Packages that use IThreeWayDiff

Package	Description
org.eclipse.team.core.diff.provider	Application programming interfaces for working with diffs.
org.eclipse.team.core.mapping.provider	Application programming interfaces for working with resource mappings.

Uses of IThreeWayDiff in org.eclipse.team.core.diff.provider

Classes in org.eclipse.team.core.diff.provider that implement IThreeWayDiff

Modifier and Type	Class	Description
class	ThreeWayDiff	Implementation of IThreeWayDiff.

Uses of IThreeWayDiff in org.eclipse.team.core.mapping.provider

Methods in org.eclipse.team.core.mapping.provider with parameters of type IThreeWayDiff

Modifier and Type	Method	Description
protected IStatus	MergeContext.performThreeWayMerge(IThreeWayDiff diff, IProgressMonitor monitor)	Perform a three-way merge on the given three-way diff that contains a content conflict.