Submitter | Katsunori FUJIWARA |
---|---|
Date | March 31, 2014, 6:17 p.m. |
Message ID | <44df0fef692bcf343d9e.1396289852@feefifofum> |
Download | mbox | patch |
Permalink | /patch/4159/ |
State | Accepted |
Commit | 539d9f839197cc7ee9698efbb6c470c0e34f2c74 |
Headers | show |
Comments
Patch
diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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):