5967 

  5967 

  5968         for f in ms:

  5968         for f in ms:

  5969             if not m(f):

  5969             if not m(f):

  5970                 continue

  5970                 continue

  5971 

  5971 

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

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

  5975             fm.startitem()

  5973             fm.startitem()

  5976             fm.context(ctx=wctx)

  5974             fm.context(ctx=wctx)

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

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

  5978             fm.data(path=f)

  5976             fm.data(path=f)

  6015         for f in ms:

  6013         for f in ms:

  6016             if not m(f):

  6014             if not m(f):

  6017                 continue

  6015                 continue

  6018 

  6016 

  6019             didwork = True

  6017             didwork = True

  6023 

  6018 

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

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

  6025             # step if asked to resolve

  6020             # step if asked to resolve

  6026             if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:

  6021             if ms[f] == mergestatemod.MERGE_RECORD_DRIVER_RESOLVED:

  6027                 exact = m.exact(f)

  6022                 exact = m.exact(f)