--- a/mercurial/commands.py Fri Dec 19 16:48:32 2008 -0600
+++ b/mercurial/commands.py Fri Dec 19 20:58:33 2008 -0600
@@ -2327,13 +2327,14 @@
del wlock
def resolve(ui, repo, *pats, **opts):
- """resolve file merges from a branch 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.
+ """retry file merges from a merge or update
+
+ 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
--- a/tests/test-globalopts.out Fri Dec 19 16:48:32 2008 -0600
+++ b/tests/test-globalopts.out Fri Dec 19 20:58:33 2008 -0600
@@ -183,7 +183,7 @@
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 @@
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
--- a/tests/test-help.out Fri Dec 19 16:48:32 2008 -0600
+++ b/tests/test-help.out Fri Dec 19 20:58:33 2008 -0600
@@ -74,7 +74,7 @@
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 @@
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