--- 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