Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 7765:da9acc68b1dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: accepts walkopts (-I and -X)
author Simon Heimberg <simohe@besonet.ch>
date Sun, 08 Feb 2009 08:44:33 +0100
parents cdc913e7fc5f
children bd8f44638847
comparison
equal deleted inserted replaced
7764:14a42208d8af 7765:da9acc68b1dd
3323 "resolve": 3323 "resolve":
3324 (resolve, 3324 (resolve,
3325 [('a', 'all', None, _('remerge all unresolved files')), 3325 [('a', 'all', None, _('remerge all unresolved files')),
3326 ('l', 'list', None, _('list state of files needing merge')), 3326 ('l', 'list', None, _('list state of files needing merge')),
3327 ('m', 'mark', None, _('mark files as resolved')), 3327 ('m', 'mark', None, _('mark files as resolved')),
3328 ('u', 'unmark', None, _('unmark files as resolved'))], 3328 ('u', 'unmark', None, _('unmark files as resolved'))]
3329 + walkopts,
3329 _('[OPTION]... [FILE]...')), 3330 _('[OPTION]... [FILE]...')),
3330 "revert": 3331 "revert":
3331 (revert, 3332 (revert,
3332 [('a', 'all', None, _('revert all changes when no arguments given')), 3333 [('a', 'all', None, _('revert all changes when no arguments given')),
3333 ('d', 'date', '', _('tipmost revision matching date')), 3334 ('d', 'date', '', _('tipmost revision matching date')),