5953 

  5953 

  5954         for f in ms:

  5954         for f in ms:

  5955             if not m(f):

  5955             if not m(f):

  5956                 continue

  5956                 continue

  5957 

  5957 

  5958             label, key = mergestateinfo[ms[f]]

  5960             label, key = mergestateinfo[ms[f]]

  5959             fm.startitem()

  5961             fm.startitem()

  5960             fm.context(ctx=wctx)

  5962             fm.context(ctx=wctx)

  5961             fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)

  5963             fm.condwrite(not nostatus, b'mergestatus', b'%s ', key, label=label)

  5962             fm.data(path=f)

  5964             fm.data(path=f)

  5999         for f in ms:

  6001         for f in ms:

  6000             if not m(f):

  6002             if not m(f):

  6001                 continue

  6003                 continue

  6002 

  6004 

  6003             didwork = True

  6005             didwork = True

  6004 

  6009 

  6005             # don't let driver-resolved files be marked, and run the conclude

  6010             # don't let driver-resolved files be marked, and run the conclude

  6006             # step if asked to resolve

  6011             # step if asked to resolve

  6007             if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:

  6012             if ms[f] == mergemod.MERGE_RECORD_DRIVER_RESOLVED:

  6008                 exact = m.exact(f)

  6013                 exact = m.exact(f)