diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java index e39b8ac0b..5f38acc26 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java @@ -347,6 +347,6 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour if(! (other instanceof CVSMergeSubscriber)) return false; CVSMergeSubscriber s = (CVSMergeSubscriber)other; return getEndTag().equals(s.getEndTag()) && - getStartTag().equals(s.getStartTag()) && rootsEqual(s); + getStartTag().equals(s.getStartTag()) && rootsEqual(s); } } |