1 #!/bin/sh
2
1 set -e
3 set -e
2 set -x
4 set -x
3
5
4 # skip commit logs
6 # skip commit logs
5 export HGMERGE=tkmerge
7 export HGMERGE=tkmerge