--- a/tests/test-install	Sun Dec 10 00:06:31 2006 -0600
+++ b/tests/test-install	Sun Dec 10 00:44:52 2006 -0600
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-hg debuginstall
+HGMERGE=merge hg debuginstall