1 #!/bin/sh
2
3 HGMERGE=true; export HGMERGE
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