Commit cd8bac31 authored by Matt Mackall's avatar Matt Mackall

resolve: clarify and simplify help

parent 0a65a1dd7894
......@@ -2327,13 +2327,14 @@ def rename(ui, repo, *pats, **opts):
del wlock
def resolve(ui, repo, *pats, **opts):
"""resolve file merges from a branch merge or update
"""retry file merges from a merge or update
This command will attempt to resolve unresolved merges from the
last update or merge command. This will use the local file
revision preserved at the last update or merge to cleanly retry
the file merge attempt. With no file or options specified, this
command will attempt to resolve all unresolved files.
This command will cleanly retry unresolved file merges using file
revisions preserved from the last update or merge. To attempt to
resolve all unresolved files, use the -a switch.
This command will also allow listing resolved files and manually
marking and unmarking files as resolved.
The codes used to show the status of files are:
U = unresolved
......
......@@ -183,7 +183,7 @@ list of commands:
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve resolve file merges from a branch merge or update
resolve retry file merges from a merge or update
revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working dir
......@@ -246,7 +246,7 @@ list of commands:
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve resolve file merges from a branch merge or update
resolve retry file merges from a merge or update
revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working dir
......
......@@ -74,7 +74,7 @@ list of commands:
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve resolve file merges from a branch merge or update
resolve retry file merges from a merge or update
revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working dir
......@@ -133,7 +133,7 @@ use "hg -v help" to show aliases and global options
recover roll back an interrupted transaction
remove remove the specified files on the next commit
rename rename files; equivalent of copy + remove
resolve resolve file merges from a branch merge or update
resolve retry file merges from a merge or update
revert restore individual files or dirs to an earlier state
rollback roll back the last transaction
root print the root (top) of the current working dir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment