[PATCH] resolve: accepts walkopts (-I and -X)
Sabina und Simon Heimberg
s.heimberg at bluewin.ch
Sun Feb 8 02:23:33 CST 2009
Let resolve accept walkopts as many other commands do.
# HG changeset patch
# User Simon Heimberg <simohe at besonet.ch>
# Date 1234079073 -3600
# Node ID 22061e5861e515561b6e4222af1c094477b96bea
# Parent edcb56991afe10ad32e84723df902a32fceba163
resolve: accepts walkopts (-I and -X)
diff -r edcb56991afe -r 22061e5861e5 mercurial/commands.py
--- a/mercurial/commands.py Sat Feb 07 23:29:12 2009 +0100
+++ b/mercurial/commands.py Sun Feb 08 08:44:33 2009 +0100
@@ -3320,7 +3320,8 @@
[('a', 'all', None, _('remerge 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'))],
+ ('u', 'unmark', None, _('unmark files as resolved'))]
+ + walkopts,
_('[OPTION]... [FILE]...')),
"revert":
(revert,
More information about the Mercurial-devel
mailing list