equal
deleted
inserted
replaced
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 ) |