Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-09-12 16:32:18 -0400
committerMichael Valenta2003-09-12 16:32:18 -0400
commitfaedfc63dc777661cbd1f057374eb894b33db812 (patch)
tree4893d052836dfbf3cc9fad7dc348a828fc88a191
parentfdf0c38562b25724fdb237dddaba940043a3114c (diff)
downloadeclipse.platform.team-faedfc63dc777661cbd1f057374eb894b33db812.tar.gz
eclipse.platform.team-faedfc63dc777661cbd1f057374eb894b33db812.tar.xz
eclipse.platform.team-faedfc63dc777661cbd1f057374eb894b33db812.zip
Fix text
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
index 647183d01..f54bba42b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
@@ -437,7 +437,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
markAsMerged(subscriber, project, new String[] { "delete.txt", "file1.txt", "file2.txt", "addition.txt", "folder1/a.txt"});
// check the sync states
- assertSyncEquals("testUnmergableConflicts", subscriber, project,
+ assertSyncEquals("testMarkAsMerged", subscriber, project,
new String[] { "delete.txt", "file1.txt", "file2.txt", "addition.txt", "folder1/a.txt"},
true, new int[] {
SyncInfo.IN_SYNC,

Back to the top