diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java')
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java index f3040790b..20df86e70 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/IMergeContext.java @@ -306,7 +306,7 @@ public interface IMergeContext extends ISynchronizationContext { * match the local state. * @param diff the diff * @param monitor a progress monitor - * @throws CoreException + * @throws CoreException if an error occurs */ public void reject(IDiff diff, IProgressMonitor monitor) throws CoreException; @@ -316,7 +316,7 @@ public interface IMergeContext extends ISynchronizationContext { * each diff. * @param diffs the diffs * @param monitor a progress monitor - * @throws CoreException + * @throws CoreException if an error occurs */ public void reject(IDiff[] diffs, IProgressMonitor monitor) throws CoreException; |