diff options
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java index b017446bbd..66af968dae 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MergingTest.java @@ -403,7 +403,10 @@ public class MergingTest extends AbstractCDOTest session.close(); } - public void testFromBranchWithChangesInSource_100() throws Exception + /** + * Bug 314605. + */ + public void _testFromBranchWithChangesInSource_100() throws Exception { disableConsole(); for (int i = 0; i < 100; i++) |