diff -r 14639c050251 -r 6d36fc70754e tests/test-merge-default
--- 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