--- a/mercurial/HGCommandParserTests.st	Thu Mar 21 23:58:22 2013 +0100
+++ b/mercurial/HGCommandParserTests.st	Fri Mar 22 09:09:49 2013 +0000
@@ -178,6 +178,54 @@
     "Created: / 15-01-2013 / 09:28:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+test_cmd_merge_03
+
+    | nergeinfo |
+
+    nergeinfo := (HGCommandParser on:' local changed lcmake.bat which remote deleted
+use (c)hanged version or (d)elete? c
+merging ApplicationDefinition.st
+merging Bag.st
+merging CharacterEncoder.st
+merging Class.st
+merging Collection.st
+merging Dictionary.st
+merging Float.st
+merging LibraryDefinition.st
+merging LongFloat.st
+merging Make.proto
+merging Make.spec
+merging Makefile
+merging OrderedCollection.st
+merging PeekableStream.st
+merging ProjectDefinition.st
+merging SequenceableCollection.st
+merging Set.st
+merging ShortFloat.st
+merging Smalltalk.st
+merging UnixOperatingSystem.st
+merging UserPreferences.st
+merging WeakIdentitySet.st
+merging abbrev.stc
+merging bc.mak
+merging libInit.cc
+merging libbasic.rc
+merging mingwmake.bat
+merging stx_libbasic.st
+merging vcmake.bat
+0 files updated, 22 files merged, 0 files removed, 7 files unresolved
+use ''hg resolve'' to retry unresolved file merges or ''hg update -C .'' to abandon
+'
+) parseCommandMerge.
+
+    self assert: nergeinfo numUpdated = 0.
+    self assert: nergeinfo numMerged = 22.
+    self assert: nergeinfo numRemoved = 0.
+    self assert: nergeinfo numUnresolved = 7.
+
+    "Created: / 22-03-2013 / 08:55:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 test_cmd_pull_01
 
     | info |