equal
deleted
inserted
replaced
3362 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3362 for f, clearable, allowcommit, msg, hint in unfinishedstates: |
3363 if clearable and repo.vfs.exists(f): |
3363 if clearable and repo.vfs.exists(f): |
3364 util.unlink(repo.join(f)) |
3364 util.unlink(repo.join(f)) |
3365 |
3365 |
3366 afterresolvedstates = [ |
3366 afterresolvedstates = [ |
|
3367 ('graftstate', |
|
3368 _('hg graft --continue')), |
3367 ] |
3369 ] |
3368 |
3370 |
3369 def checkafterresolved(repo): |
3371 def checkafterresolved(repo): |
3370 contmsg = _("continue: %s\n") |
3372 contmsg = _("continue: %s\n") |
3371 for f, msg in afterresolvedstates: |
3373 for f, msg in afterresolvedstates: |