| changeset 46361 | dfca84970da8 |
| parent 45916 | fa87536d3d70 |
| child 46819 | d4ba4d51f85f |
| 46360:1726a53a8494 | 46361:dfca84970da8 |
|---|---|
11 |
11 |
12 from . import error |
12 from . import error |
13 |
13 |
14 |
14 |
15 def checkunresolved(ms): |
15 def checkunresolved(ms): |
16 if list(ms.unresolved()): |
16 if ms.unresolvedcount(): |
17 raise error.StateError( |
17 raise error.StateError( |
18 _(b"unresolved merge conflicts (see 'hg help resolve')") |
18 _(b"unresolved merge conflicts (see 'hg help resolve')") |
19 ) |
19 ) |