Mercurial > hg > RemoteEditor > REPSessionManager

changeset 392:85d01cb6d133

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vim almost worked
author one@firefly.cr.ie.u-ryukyu.ac.jp
date Mon, 10 Nov 2008 22:25:51 +0900
parents 3b0a5a55e3ee
children 18cacd0b3ccf
files rep/SessionManager.java test/AutoSelectManager.java
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rep/SessionManager.java	Mon Nov 10 22:25:14 2008 +0900
+++ b/rep/SessionManager.java	Mon Nov 10 22:25:51 2008 +0900
@@ -23,7 +23,6 @@
 import rep.handler.Forwarder;
 import rep.xml.SessionXMLDecoder;
 import rep.xml.SessionXMLEncoder;
-import test.sematest.TestGUI;
 
 /*
 	+-------+--------+--------+-------+--------+---------+------+
--- a/test/AutoSelectManager.java	Mon Nov 10 22:25:14 2008 +0900
+++ b/test/AutoSelectManager.java	Mon Nov 10 22:25:51 2008 +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);