equal
deleted
inserted
replaced
810 interactive = state.interactive |
810 interactive = state.interactive |
811 basename = state.name |
811 basename = state.name |
812 with repo.lock(): |
812 with repo.lock(): |
813 checkparents(repo, state) |
813 checkparents(repo, state) |
814 ms = mergestatemod.mergestate.read(repo) |
814 ms = mergestatemod.mergestate.read(repo) |
815 if list(ms.unresolved()): |
815 if ms.unresolvedcount(): |
816 raise error.Abort( |
816 raise error.Abort( |
817 _(b"unresolved conflicts, can't continue"), |
817 _(b"unresolved conflicts, can't continue"), |
818 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"), |
818 hint=_(b"see 'hg resolve', then 'hg unshelve --continue'"), |
819 ) |
819 ) |
820 |
820 |