2330     """resolve file merges from a branch merge or update

  2330     """retry file merges from a merge or update

  2331 

  2331 

  2332     This command will attempt to resolve unresolved merges from the

  2332     This command will cleanly retry unresolved file merges using file

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

  2333     revisions preserved from the last update or merge. To attempt to

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

  2334     resolve all unresolved files, use the -a switch.

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

  2335 

  2336     command will attempt to resolve all unresolved files.

  2336     This command will also allow listing resolved files and manually

  2337     marking and unmarking files as resolved.