2988                 if ms.resolve(f, wctx, mctx):

  2988                 if ms.resolve(f, wctx, mctx):

  2989                     ret = 1

  2989                     ret = 1

  2990 

  2990 

  2991                 # replace filemerge's .orig file with our resolve file

  2991                 # replace filemerge's .orig file with our resolve file

  2992                 util.rename(a + ".resolve", a + ".orig")

  2992                 util.rename(a + ".resolve", a + ".orig")

  2993     return ret

  2995     return ret

  2994 

  2996 

  2995 def revert(ui, repo, *pats, **opts):

  2997 def revert(ui, repo, *pats, **opts):

  2996     """restore individual files or directories to an earlier state

  2998     """restore individual files or directories to an earlier state

  2997 

  2999