--- a/tests/test-merge1 Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-merge1 Thu May 14 16:03:17 2009 +0200
@@ -30,6 +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 1
hg diff --nodates
hg status