Mercurial > hg > RemoteEditor > REPSessionManager
comparison test/sematest/TestEditor.java @ 465:c83af820eb62
merge mark
author | one |
---|---|
date | Sat, 02 Oct 2010 08:32:26 +0900 |
parents | 22a741c1fa2d |
children | d2762d669617 |
comparison
equal
deleted
inserted
replaced
464:295c257ac073 | 465:c83af820eb62 |
---|---|
248 cmd.setString(del); | 248 cmd.setString(del); |
249 } | 249 } |
250 forwardCommand(cmd); | 250 forwardCommand(cmd); |
251 break; | 251 break; |
252 case REPCMD_NOP : | 252 case REPCMD_NOP : |
253 case REPCMD_MERGE_MARK : | |
253 case REPCMD_INSERT_ACK : | 254 case REPCMD_INSERT_ACK : |
254 case REPCMD_DELETE_ACK : | 255 case REPCMD_DELETE_ACK : |
255 forwardCommand(cmd); | 256 forwardCommand(cmd); |
256 break; | 257 break; |
257 case REPCMD_CLOSE : | 258 case REPCMD_CLOSE : |