diff -r 93f573d1bfb9 -r 539d9f839197 mercurial/merge.py
--- a/mercurial/merge.py	Tue Apr 01 13:27:12 2014 -0300
+++ b/mercurial/merge.py	Tue Apr 01 02:46:03 2014 +0900
@@ -70,7 +70,7 @@
                 bits = record.split("\0")
                 self._state[bits[0]] = bits[1:]
             elif not rtype.islower():
-                raise util.Abort(_('unsupported merge state record:'
+                raise util.Abort(_('unsupported merge state record: %s'
                                    % rtype))
         self._dirty = False
     def _readrecords(self):