diff -r 197d54d82f8d -r 1fe6f365df2e tests/test-command-template
--- a/tests/test-command-template	Mon Jun 23 15:03:22 2008 +0200
+++ b/tests/test-command-template	Mon Jun 23 15:02:52 2008 +0200
@@ -23,7 +23,7 @@
 echo other 4 >> d
 hg add d
 hg commit -m 'new head' -d '1500000 0' -u 'person'
-hg merge -q
+hg merge -q foo
 hg commit -m 'merge' -d '1500001 0' -u 'person'
 # second branch starting at nullrev
 hg update null