equal
deleted
inserted
replaced
1562 driverresolved = True |
1562 driverresolved = True |
1563 |
1563 |
1564 if unresolved: |
1564 if unresolved: |
1565 raise error.Abort(_('unresolved merge conflicts ' |
1565 raise error.Abort(_('unresolved merge conflicts ' |
1566 '(see "hg help resolve")')) |
1566 '(see "hg help resolve")')) |
1567 if driverresolved: |
1567 if driverresolved or ms.mdstate() != 's': |
1568 raise error.Abort(_('driver-resolved merge conflicts'), |
1568 raise error.Abort(_('driver-resolved merge conflicts'), |
1569 hint=_('run "hg resolve --all" to resolve')) |
1569 hint=_('run "hg resolve --all" to resolve')) |
1570 |
1570 |
1571 if editor: |
1571 if editor: |
1572 cctx._text = editor(self, cctx, subs) |
1572 cctx._text = editor(self, cctx, subs) |