Skip to content
Snippets Groups Projects
Commit 539d9f83 authored by Katsunori FUJIWARA's avatar Katsunori FUJIWARA
Browse files

merge: fix lack of "%s" in format string causing TypeError at runtime

parent 93f573d1
No related branches found
No related tags found
No related merge requests found
......@@ -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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment