Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 4361: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
comparison
equal deleted inserted replaced
4360:d5c3a70f8422 4361:46280c004f22
1 #!/bin/sh 1 #!/bin/sh
2
3 HGMERGE=true; export HGMERGE
2 4
3 set -e 5 set -e
4 mkdir r1 6 mkdir r1
5 cd r1 7 cd r1
6 hg init 8 hg init