Mercurial > hg > RemoteEditor > REPSessionManager

diff test/AutoSelectManager.java @ 420:5c95a9020e31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Modify ServerMainLoop
author one
date Fri, 13 Feb 2009 19:13:50 +0900
parents 784a4d67e6a5
children 7420dea70dd7
line wrap: on
line diff
--- a/test/AutoSelectManager.java	Tue Jan 20 18:39:02 2009 +0900
+++ b/test/AutoSelectManager.java	Fri Feb 13 19:13:50 2009 +0900
@@ -21,7 +21,7 @@
 			port = Integer.parseInt(args[0]);
 			port_s = Integer.parseInt(args[1]);
 		}
-		Editor.noMergeMode = true;
+		Editor.noMergeMode = false;
 		SessionManager sm = new SessionManager();
 		sm.setReceivePort(port);
 		sm.setParentPort(port_s);