Mercurial > hg

changeset 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 14a42208d8af
children 2b2548342265
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sun Feb 15 12:56:38 2009 +0100
+++ b/mercurial/commands.py	Sun Feb 08 08:44:33 2009 +0100
@@ -3325,7 +3325,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,