diff tests/test-install @ 4365:46280c004f22

change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 18855084b922
children 36c388a1aa51
line wrap: on
line diff
--- a/tests/test-install	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-install	Mon Apr 16 20:17:39 2007 -0300
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-HGMERGE=merge hg debuginstall
+hg debuginstall