Mercurial > hg-stable

changeset 20867:539d9f839197 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix lack of "%s" in format string causing TypeError at runtime
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 01 Apr 2014 02:46:03 +0900
parents 93f573d1bfb9
children 5db105f216c3
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):