--- a/tests/test-merge-default Fri Aug 24 00:56:56 2007 +0200
+++ b/tests/test-merge-default Sat Aug 25 11:30:11 2007 +0200
@@ -34,6 +34,10 @@
hg merge
hg commit -mm2
+echo % should fail because at tip
+hg merge
+
+hg up 0
echo % should fail because 1 head
hg merge