Mercurial > hg > gitweb

changeset 3517:b0dc459cd06c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some more deprecated options from help syntax summaries
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Oct 2006 17:40:03 -0500
parents 5c57a5a17963
children 467d923e4e3d
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Oct 25 17:38:17 2006 -0500
+++ b/mercurial/commands.py	Wed Oct 25 17:40:03 2006 -0500
@@ -3014,7 +3014,7 @@
           ('b', 'base', '', _('base path (DEPRECATED)')),
           ('f', 'force', None,
            _('skip check for outstanding uncommitted changes'))],
-         _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')),
+         _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
     "incoming|in": (incoming,
          [('M', 'no-merges', None, _('do not show merges')),
           ('f', 'force', None,
@@ -3195,7 +3195,7 @@
           ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
           ('C', 'clean', None, _('overwrite locally modified files')),
           ('f', 'force', None, _('force a merge with outstanding changes'))],
-         _('hg update [-m] [-C] [-f] [REV]')),
+         _('hg update [-C] [-f] [REV]')),
     "verify": (verify, [], _('hg verify')),
     "version": (show_version, [], _('hg version')),
 }