Mercurial > hg

diff tests/test-double-merge @ 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-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 --"