--- a/mercurial/HGCommandParserTests.st	Mon Jan 14 14:39:05 2013 +0000
+++ b/mercurial/HGCommandParserTests.st	Mon Jan 14 17:01:55 2013 +0000
@@ -91,6 +91,30 @@
     "Created: / 05-12-2012 / 19:16:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+test_cmd_merge_01
+
+    | nergeinfo |
+
+    nergeinfo := (HGCommandParser on: 'merging Make.proto
+merging Make.spec
+merging MockHGP3Foo.st
+merging abbrev.stc
+merging bc.mak
+merging libInit.cc
+merging mocks_hg_p3.st
+merging p3.rc
+2 files updated, 3 files merged, 0 files removed, 5 files unresolved
+use ''hg resolve'' to retry unresolved file merges or ''hg update -C .'' to abandon
+') parseCommandMerge.
+
+    self assert: nergeinfo numUpdated = 2.
+    self assert: nergeinfo numMerged = 3.
+    self assert: nergeinfo numRemoved = 0.
+    self assert: nergeinfo numUnresolved = 5.
+
+    "Created: / 14-01-2013 / 15:58:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 test_cmd_showconfig_01
 
     | section |
@@ -202,6 +226,21 @@
     self assert: statuses second second = 'something.txt'.
 
     "Created: / 21-11-2012 / 01:09:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+test_cmd_update_01
+
+    | nergeinfo |
+
+    nergeinfo := (HGCommandParser on: '9 files updated, 0 files merged, 1 files removed, 0 files unresolved
+') parseCommandUpdate.
+
+    self assert: nergeinfo numUpdated = 9.
+    self assert: nergeinfo numMerged = 0.
+    self assert: nergeinfo numRemoved = 1.
+    self assert: nergeinfo numUnresolved = 0.
+
+    "Created: / 14-01-2013 / 15:46:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !HGCommandParserTests methodsFor:'tests - misc'!