--- a/mercurial/merge.py	Tue Apr 01 02:46:03 2014 +0900
+++ b/mercurial/merge.py	Tue Apr 01 02:46:03 2014 +0900
@@ -70,8 +70,8 @@
                 bits = record.split("\0")
                 self._state[bits[0]] = bits[1:]
             elif not rtype.islower():
-                raise util.Abort(_('unsupported merge state record: %s'
-                                   % rtype))
+                raise util.Abort(_('unsupported merge state record: %s')
+                                   % rtype)
         self._dirty = False
     def _readrecords(self):
         v1records = self._readrecordsv1()