diff options
| author | Michael Valenta | 2005-12-14 20:31:58 +0000 |
|---|---|---|
| committer | Michael Valenta | 2005-12-14 20:31:58 +0000 |
| commit | acb5a57bb975887e8eb41795b2444c3ebd46d1ff (patch) | |
| tree | e3c5856a52e80340e55d7258a9af3364a0695f61 /bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java | |
| parent | a05f45cf29f5fdd4d219a495b937044a1894368d (diff) | |
| download | eclipse.platform.team-acb5a57bb975887e8eb41795b2444c3ebd46d1ff.tar.gz eclipse.platform.team-acb5a57bb975887e8eb41795b2444c3ebd46d1ff.tar.xz eclipse.platform.team-acb5a57bb975887e8eb41795b2444c3ebd46d1ff.zip | |
Refactored API a bit
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java index d6f1fb1fc..f2554859d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DefaultResourceMappingMerger.java @@ -17,6 +17,7 @@ import org.eclipse.core.resources.mapping.*; import org.eclipse.core.runtime.*; import org.eclipse.team.core.diff.IDiffNode; import org.eclipse.team.core.mapping.*; +import org.eclipse.team.core.mapping.provider.MergeStatus; import org.eclipse.team.internal.ui.Policy; /** |