Mercurial > public > mercurial-scm > hg
diff mercurial/mergeutil.py @ 43077:687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Done with
python3.7 contrib/byteify-strings.py -i $(hg files 'set:mercurial/**.py - mercurial/thirdparty/** + hgext/**.py - hgext/fsmonitor/pywatchman/** - mercurial/__init__.py')
black -l 80 -t py33 -S $(hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**" - hgext/fsmonitor/pywatchman/**')
# skip-blame mass-reformatting only
Differential Revision: https://phab.mercurial-scm.org/D6972
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:48:39 -0400 |
| parents | 2372284d9457 |
| children | 8ff1ecfadcd1 |
line wrap: on
line diff
--- a/mercurial/mergeutil.py Sun Oct 06 09:45:02 2019 -0400 +++ b/mercurial/mergeutil.py Sun Oct 06 09:48:39 2019 -0400 @@ -15,10 +15,10 @@ def checkunresolved(ms): if list(ms.unresolved()): raise error.Abort( - _("unresolved merge conflicts " "(see 'hg help resolve')") + _(b"unresolved merge conflicts " b"(see 'hg help resolve')") ) - if ms.mdstate() != 's' or list(ms.driverresolved()): + if ms.mdstate() != b's' or list(ms.driverresolved()): raise error.Abort( - _('driver-resolved merge conflicts'), - hint=_('run "hg resolve --all" to resolve'), + _(b'driver-resolved merge conflicts'), + hint=_(b'run "hg resolve --all" to resolve'), )