2250     This command will attempt to resolve unresolved merges from the

  2250     This command will attempt to resolve unresolved merges from the

  2251     last update or merge command. This will use the local file

  2251     last update or merge command. This will use the local file

  2252     revision preserved at the last update or merge to cleanly retry

  2252     revision preserved at the last update or merge to cleanly retry

  2253     the file merge attempt. With no file or options specified, this

  2253     the file merge attempt. With no file or options specified, this

  2254     command will attempt to resolve all unresolved files.

  2254     command will attempt to resolve all unresolved files.

  2255     """

  2259     """

  2256 

  2260 

  2257     if len([x for x in opts if opts[x]]) > 1:

  2261     if len([x for x in opts if opts[x]]) > 1:

  2258         raise util.Abort(_("too many options specified"))

  2262         raise util.Abort(_("too many options specified"))

  2259 

  2263