diff options
| author | james | 2002-05-13 19:24:36 +0000 |
|---|---|---|
| committer | james | 2002-05-13 19:24:36 +0000 |
| commit | 358d52c236f737b8a79e2b0a83771128b4c067a2 (patch) | |
| tree | 6c8d04ea8185e6b1d865d1a75fbd5b143e2469fc | |
| parent | b0830ba818cec35a3aa5b1f705a24634c8e852f4 (diff) | |
| download | eclipse.platform.team-358d52c236f737b8a79e2b0a83771128b4c067a2.tar.gz eclipse.platform.team-358d52c236f737b8a79e2b0a83771128b4c067a2.tar.xz eclipse.platform.team-358d52c236f737b8a79e2b0a83771128b4c067a2.zip | |
8948: MergeResource.confirmMerge() incomplete
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java index 1e31d5a98..47dda8a70 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/MergeResource.java @@ -39,14 +39,6 @@ public class MergeResource { } /** - * The user has manually merged contents from the server into - * the local resource. Clear the incoming changes from the server. - */ - public void confirmMerge() { - // manager.confirmMerge(syncTree.getResource()); - } - - /** * Returns an InputStream for the base revision of this incoming resource. */ public InputStream getBaseRevision() throws CoreException { |