tests/test-backout
changeset 4361 46280c004f22
parent 2614 8ba1c31f6864
child 4726 f6e961c0155b
--- a/tests/test-backout
+++ b/tests/test-backout
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+HGMERGE=true; export HGMERGE
+
 echo '# basic operation'
 hg init basic
 cd basic