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.
|
Modifier and Type | Class and Description |
---|---|
class |
ThreeWayDiff
Implementation of
IThreeWayDiff . |
Modifier and Type | Method and 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.
|
Copyright (c) 2000, 2015 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.