diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java')
-rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java index 6256fecd3..d42d8f331 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/mapping/DelegatingStorageMerger.java @@ -104,7 +104,7 @@ public class DelegatingStorageMerger implements IStorageMerger { * to create the merger to which the merge should be delegated. * @param target the storage that contains the target contents of the merge. * @return a merger for the given storage or <code>null</code> - * @throws CoreException + * @throws CoreException no merger found */ protected IStorageMerger createDelegateMerger(IStorage target) throws CoreException { IStorageMerger merger = null; |