diff -r 197d54d82f8d -r 1fe6f365df2e tests/test-convert-clonebranches
--- a/tests/test-convert-clonebranches	Mon Jun 23 15:03:22 2008 +0200
+++ b/tests/test-convert-clonebranches	Mon Jun 23 15:02:52 2008 +0200
@@ -17,7 +17,7 @@
 echo b > b
 hg ci -qAm addb
 hg up -qC
-hg merge
+hg merge default
 hg ci -qm mergeab
 hg tag -ql mergeab
 cd ..