Show More
| @@ -531,7 +531,7 b' def unshelvecontinue(ui, repo, state, op' | |||
|
|
531 | 531 | lock = None |
|
|
532 | 532 | try: |
|
|
533 | 533 | checkparents(repo, state) |
|
|
534 | ms = merge.mergestate(repo) | |
|
|
534 | ms = merge.mergestate.read(repo) | |
|
|
535 | 535 | if [f for f in ms if ms[f] == 'u']: |
|
|
536 | 536 | raise error.Abort( |
|
|
537 | 537 | _("unresolved conflicts, can't continue"), |
General Comments 0
You need to be logged in to leave comments.
Login now