diff test/editortest/TestSessionManager2.java @ 416:b7f42fc75a36

(no commit message)
author one
date Wed, 31 Dec 2008 14:47:39 +0900
parents 784a4d67e6a5
children
line wrap: on
line diff
--- a/test/editortest/TestSessionManager2.java	Tue Dec 09 16:34:41 2008 +0900
+++ b/test/editortest/TestSessionManager2.java	Wed Dec 31 14:47:39 2008 +0900
@@ -7,6 +7,7 @@
 import rep.channel.REPServerSocketChannel;
 import rep.gui.SessionManagerEvent;
 import rep.gui.SessionManagerGUI;
+import rep.handler.Editor;
 import test.sematest.TestGUI;
 
 
@@ -116,7 +117,7 @@
 		 *    isSimulation=false    socket based communication mode
 		 */
 		REPServerSocketChannel.isSimulation = false;
-		//Editor.noMergeMode = true;
+		Editor.noMergeMode = false;
 		// At least 3 TestEditors are required.
 		TestSessionManager2 test = new TestSessionManager2(1, 0, 3);
 		logger.setLogLevel(5);