Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 8834:6d36fc70754e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: rename -S/--show option to -P/--preview
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 19 Jun 2009 13:58:48 +0200
parents e87b0fc4750b
children 80cc4b1a62d0
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Jun 19 13:58:22 2009 +0200
+++ b/mercurial/commands.py	Fri Jun 19 13:58:48 2009 +0200
@@ -2108,7 +2108,7 @@
                                'use "hg update" or merge with an explicit rev'))
         node = parent == bheads[0] and bheads[-1] or bheads[0]
 
-    if opts.get('show'):
+    if opts.get('preview'):
         p1 = repo['.']
         p2 = repo[node]
         common = p1.ancestor(p2)
@@ -3358,7 +3358,7 @@
         (merge,
          [('f', 'force', None, _('force a merge with outstanding changes')),
           ('r', 'rev', '', _('revision to merge')),
-          ('S', 'show', None,
+          ('P', 'preview', None,
            _('review revisions to merge (no merge is performed)'))],
          _('[-f] [[-r] REV]')),
     "outgoing|out":