Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 43076:2372284d9457 | 43077:687b865b95ad |
|---|---|
| 13 | 13 |
| 14 | 14 |
| 15 def checkunresolved(ms): | 15 def checkunresolved(ms): |
| 16 if list(ms.unresolved()): | 16 if list(ms.unresolved()): |
| 17 raise error.Abort( | 17 raise error.Abort( |
| 18 _("unresolved merge conflicts " "(see 'hg help resolve')") | 18 _(b"unresolved merge conflicts " b"(see 'hg help resolve')") |
| 19 ) | 19 ) |
| 20 if ms.mdstate() != 's' or list(ms.driverresolved()): | 20 if ms.mdstate() != b's' or list(ms.driverresolved()): |
| 21 raise error.Abort( | 21 raise error.Abort( |
| 22 _('driver-resolved merge conflicts'), | 22 _(b'driver-resolved merge conflicts'), |
| 23 hint=_('run "hg resolve --all" to resolve'), | 23 hint=_(b'run "hg resolve --all" to resolve'), |
| 24 ) | 24 ) |