tests/test-up-local-change

--- a/tests/test-up-local-change	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-up-local-change	Mon Apr 16 20:17:39 2007 -0300
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 set -e
 mkdir r1
 cd r1