author | Martin Geisler <mg@daimi.au.dk> |
Sat, 06 Sep 2008 17:44:07 +0200 | |
changeset 7003 | 2365c6d4c330 |
parent 7002 | 07c8396fa001 |
child 7004 | 90227c42b5f6 |
--- a/mercurial/commands.py Sat Sep 06 17:44:03 2008 +0200 +++ b/mercurial/commands.py Sat Sep 06 17:44:07 2008 +0200 @@ -3234,7 +3234,7 @@ [('l', 'list', None, _('list state of files needing merge')), ('m', 'mark', None, _('mark files as resolved')), ('u', 'unmark', None, _('unmark files as resolved'))], - ('hg resolve [OPTION] [FILES...]')), + _('hg resolve [OPTION] [FILES...]')), "revert": (revert, [('a', 'all', None, _('revert all changes when no arguments given')),