|
Eclipse Platform Release 3.6 |
|||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use IThreeWayDiff | |
|---|---|
| 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. |
| Uses of IThreeWayDiff in org.eclipse.team.core.diff.provider |
|---|
| Classes in org.eclipse.team.core.diff.provider that implement IThreeWayDiff | |
|---|---|
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 | |
|---|---|
protected IStatus |
MergeContext.performThreeWayMerge(IThreeWayDiff diff,
IProgressMonitor monitor)
Perform a three-way merge on the given three-way diff that contains a content conflict. |
|
Eclipse Platform Release 3.6 |
|||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
Guidelines for using Eclipse APIs.
Copyright (c) Eclipse contributors and others 2000, 2010. All rights reserved.