Mercurial > hg

diff tests/test-merge1 @ 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 50b6af595e0c
children
line wrap: on
line diff
--- 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