diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java')
| -rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java index 41ff492e5..37e15e353 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/provider/MergeContext.java @@ -316,7 +316,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe * the diff whose local is to be replaced * @param monitor * a progress monitor - * @throws CoreException + * @throws CoreException if an error occurs */ protected void performReplace(final IDiff diff, IProgressMonitor monitor) throws CoreException { IResourceDiff d; @@ -356,7 +356,7 @@ public abstract class MergeContext extends SynchronizationContext implements IMe * the diff whose local is now in-sync * @param monitor * a progress monitor - * @throws CoreException + * @throws CoreException if an error occurs */ protected abstract void makeInSync(IDiff diff, IProgressMonitor monitor) throws CoreException; |