Mercurial > hg > RemoteEditor > REPSessionManager

diff test/editortest/TestSimpleEditor.java @ 484:7420dea70dd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Direct Merge first try
author one
date Wed, 20 Oct 2010 21:19:24 +0900
parents 7ff127c8ad64
children
line wrap: on
line diff
--- a/test/editortest/TestSimpleEditor.java	Sat Oct 16 20:48:38 2010 +0900
+++ b/test/editortest/TestSimpleEditor.java	Wed Oct 20 21:19:24 2010 +0900
@@ -42,7 +42,7 @@
 		user.add(editor1); user.add(editor2); user.add(editor3);
 		user.setVisible(true);
 		
-		Editor.noMergeMode = false;
+		Editor.mergeMode = Editor.MergeMode.Direct;
 		
 	}