Show More
@@ -659,7 +659,7 b' def unshelvecontinue(ui, repo, state, op' | |||
|
659 | 659 | with repo.lock(): |
|
660 | 660 | checkparents(repo, state) |
|
661 | 661 | ms = merge.mergestate.read(repo) |
|
662 | if [f for f in ms if ms[f] == 'u']: | |
|
662 | if list(ms.unresolved()): | |
|
663 | 663 | raise error.Abort( |
|
664 | 664 | _("unresolved conflicts, can't continue"), |
|
665 | 665 | hint=_("see 'hg resolve', then 'hg unshelve --continue'")) |
General Comments 0
You need to be logged in to leave comments.
Login now