--- a/mercurial/commands.py Sat Nov 07 15:51:32 2009 +0100
+++ b/mercurial/commands.py Mon Oct 26 02:06:23 2009 +0200
@@ -2455,13 +2455,15 @@
"""retry file merges from a merge or update
This command can 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/--all switch.
+ revisions preserved from the last update or merge.
If a conflict is resolved manually, please note that the changes
will be overwritten if the merge is retried with resolve. The
-m/--mark switch should be used to mark the file as resolved.
+ You can specify a set of files to operate on, or use the -a/-all
+ switch to select all unresolved files.
+
This command also allows listing resolved files and manually
indicating whether or not files are resolved. All files must be
marked as resolved before a commit is permitted.
@@ -3601,7 +3603,7 @@
_('[OPTION]... SOURCE... DEST')),
"resolve":
(resolve,
- [('a', 'all', None, _('remerge all unresolved files')),
+ [('a', 'all', None, _('select all unresolved files')),
('l', 'list', None, _('list state of files needing merge')),
('m', 'mark', None, _('mark files as resolved')),
('u', 'unmark', None, _('unmark files as resolved')),