Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 7530:3773e510d433 1.1.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: clarify and simplify help
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Dec 2008 20:58:33 -0600
parents eadcc075967e
children f1069e7f5635
comparison
equal deleted inserted replaced
7529:0a65a1dd7894 7530:3773e510d433
2325 return cmdutil.copy(ui, repo, pats, opts, rename=True) 2325 return cmdutil.copy(ui, repo, pats, opts, rename=True)
2326 finally: 2326 finally:
2327 del wlock 2327 del wlock
2328 2328
2329 def resolve(ui, repo, *pats, **opts): 2329 def resolve(ui, repo, *pats, **opts):
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.
2337 2338
2338 The codes used to show the status of files are: 2339 The codes used to show the status of files are:
2339 U = unresolved 2340 U = unresolved
2340 R = resolved 2341 R = resolved
2341 """ 2342 """