| 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
Package Specification
This package specifies the API for working with resources 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.
|
Guidelines for using Eclipse APIs. Copyright (c) IBM Corp. and others 2000, 2006. All rights reserved.