diff options
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.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/MergeWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java index f6a629a40..12ddd91c6 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java @@ -221,7 +221,7 @@ public class MergeWizardPage extends CVSWizardPage { } protected void setStartTag(CVSTag selectedTag) { - if (selectedTag == null || startTag != null || !endTag.equals(selectedTag)) { + if (selectedTag == null || startTag != null || endTag == null || !endTag.equals(selectedTag)) { startTag = selectedTag; if (startTagField != null) { String name = startTagField.getText(); |