--- a/tests/test-double-merge	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-double-merge	Thu May 14 16:03:17 2009 +0200
@@ -20,6 +20,7 @@
 hg ci -m 'change foo' -d "1000000 0"
 
 # we get conflicts that shouldn't be there
+hg merge -S
 hg merge --debug
 
 echo "-- foo --"