diff options
| author | Tomasz Zarna | 2011-01-04 12:23:56 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2011-01-04 12:23:56 +0000 |
| commit | 1092b129dc88375b499e33b31fe03e09c5fc5b26 (patch) | |
| tree | 168d8435c550b699f0e7aa89387bddb1d92c17c5 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java | |
| parent | 9cb408121ea499fe91af0596c75792f47957db6c (diff) | |
| download | eclipse.platform.team-1092b129dc88375b499e33b31fe03e09c5fc5b26.tar.gz eclipse.platform.team-1092b129dc88375b499e33b31fe03e09c5fc5b26.tar.xz eclipse.platform.team-1092b129dc88375b499e33b31fe03e09c5fc5b26.zip | |
typo fixed
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java index 8e8b9a02d..83a753ec8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizard.java @@ -90,7 +90,7 @@ public class MergeWizard extends Wizard { resources = getAllResources(startTag, endTag); } catch (InvocationTargetException e) { // Log and continue with the original resources - CVSUIPlugin.log(IStatus.ERROR, "An error occurred while detemrining if extra resources should be included in the merge", e.getTargetException()); //$NON-NLS-1$ + CVSUIPlugin.log(IStatus.ERROR, "An error occurred while determining if extra resources should be included in the merge", e.getTargetException()); //$NON-NLS-1$ } MergeSynchronizeParticipant participant = MergeSynchronizeParticipant.getMatchingParticipant(resources, startTag, endTag); if(participant == null) { |