6001     # Nudge users into finishing an unfinished operation

  6001     # Nudge users into finishing an unfinished operation

  6002     unresolvedf = list(ms.unresolved())

  6002     unresolvedf = list(ms.unresolved())

  6003     driverresolvedf = list(ms.driverresolved())

  6003     driverresolvedf = list(ms.driverresolved())

  6004     if not unresolvedf and not driverresolvedf:

  6004     if not unresolvedf and not driverresolvedf:

  6005         ui.status(_('(no more unresolved files)\n'))

  6005         ui.status(_('(no more unresolved files)\n'))

  6006     elif not unresolvedf:

  6007     elif not unresolvedf:

  6007         ui.status(_('(no more unresolved files -- '

  6008         ui.status(_('(no more unresolved files -- '

  6008                     'run "hg resolve --all" to conclude)\n'))

  6009                     'run "hg resolve --all" to conclude)\n'))

  6009 

  6010 

  6010     return ret

  6011     return ret