Mercurial > hg > gitweb

comparison tests/test-backout @ 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 8ba1c31f6864
children
comparison
equal deleted inserted replaced
4364:d5c3a70f8422 4365:46280c004f22
1 #!/bin/sh 1 #!/bin/sh
2
3 HGMERGE=true; export HGMERGE
2 4
3 echo '# basic operation' 5 echo '# basic operation'
4 hg init basic 6 hg init basic
5 cd basic 7 cd basic
6 echo a > a 8 echo a > a