--- 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":
--- a/tests/test-debugcomplete.out Fri Jun 19 13:58:22 2009 +0200
+++ b/tests/test-debugcomplete.out Fri Jun 19 13:58:48 2009 +0200
@@ -169,7 +169,7 @@
export: output, switch-parent, text, git, nodates
init: ssh, remotecmd
log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude
-merge: force, rev, show
+merge: force, rev, preview
parents: rev, style, template
pull: update, force, rev, ssh, remotecmd
push: force, rev, ssh, remotecmd
--- a/tests/test-double-merge Fri Jun 19 13:58:22 2009 +0200
+++ b/tests/test-double-merge Fri Jun 19 13:58:48 2009 +0200
@@ -20,7 +20,7 @@
hg ci -m 'change foo' -d "1000000 0"
# we get conflicts that shouldn't be there
-hg merge -S
+hg merge -P
hg merge --debug
echo "-- foo --"
--- a/tests/test-merge-default Fri Jun 19 13:58:22 2009 +0200
+++ b/tests/test-merge-default Fri Jun 19 13:58:48 2009 +0200
@@ -31,7 +31,7 @@
hg commit -mm1
echo % should succeed - 2 heads
-hg merge -S
+hg merge -P
hg merge
hg commit -mm2
--- a/tests/test-merge1 Fri Jun 19 13:58:22 2009 +0200
+++ b/tests/test-merge1 Fri Jun 19 13:58:48 2009 +0200
@@ -30,7 +30,7 @@
hg commit -m "commit #2" -d "1000000 0"
echo This is file b1 > b
echo %% no merges expected
-hg merge -S 1
+hg merge -P 1
hg merge 1
hg diff --nodates
hg status