Mercurial > hg

diff tests/test-up-local-change @ 4365:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 096f1c73cdc3
children 7a7d4937272b
line wrap: on
line diff
--- 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