Mercurial > hg > RemoteEditor > REPSessionManager

diff test/sematest/TestEditor.java @ 465:c83af820eb62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge mark
author one
date Sat, 02 Oct 2010 08:32:26 +0900
parents 22a741c1fa2d
children d2762d669617
line wrap: on
line diff
--- a/test/sematest/TestEditor.java	Fri Oct 01 18:48:40 2010 +0900
+++ b/test/sematest/TestEditor.java	Sat Oct 02 08:32:26 2010 +0900
@@ -250,6 +250,7 @@
 			forwardCommand(cmd);
 			break;
 		case REPCMD_NOP		:
+		case REPCMD_MERGE_MARK		:
 		case REPCMD_INSERT_ACK		:
 		case REPCMD_DELETE_ACK		:
 			forwardCommand(cmd);