##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

resolve: accepts walkopts (-I and -X)
Simon Heimberg -
r7765:da9acc68 default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -3325,7 +3325,8 b' table = {'
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,
General Comments 0
You need to be logged in to leave comments. Login now