5897             fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)

  5897             fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)

  5898             fm.write('path', '%s\n', f, label=l)

  5898             fm.write('path', '%s\n', f, label=l)

  5899         fm.end()

  5899         fm.end()

  5900         return 0

  5900         return 0

  5901 

  5901 

  5904         ms = mergemod.mergestate.read(repo)

  5903         ms = mergemod.mergestate.read(repo)

  5905 

  5904 

  5906         if not (ms.active() or repo.dirstate.p2() != nullid):

  5905         if not (ms.active() or repo.dirstate.p2() != nullid):

  5907             raise error.Abort(

  5906             raise error.Abort(

  5908                 _('resolve command not applicable when not merging'))

  5907                 _('resolve command not applicable when not merging'))

  6014                 and not list(ms.unresolved())):

  6013                 and not list(ms.unresolved())):

  6015                 proceed = mergemod.driverconclude(repo, ms, wctx)

  6014                 proceed = mergemod.driverconclude(repo, ms, wctx)

  6016                 ms.commit()

  6015                 ms.commit()

  6017                 if not proceed:

  6016                 if not proceed:

  6018                     return 1

  6017                     return 1

  6022 

  6018 

  6023     # Nudge users into finishing an unfinished operation

  6019     # Nudge users into finishing an unfinished operation

  6024     unresolvedf = list(ms.unresolved())

  6020     unresolvedf = list(ms.unresolved())

  6025     driverresolvedf = list(ms.driverresolved())

  6021     driverresolvedf = list(ms.driverresolved())

  6026     if not unresolvedf and not driverresolvedf:

  6022     if not unresolvedf and not driverresolvedf: