| changeset 808 | 8f5637f0a0c0 |
| parent 547 | 4fc63e22b1fe |
| parent 797 | 95c258ee5264 |
| child 814 | 0902ffece4b4 |
| 788:64d2a558c943 | 808:8f5637f0a0c0 |
|---|---|
2 |
2 |
3 set -e |
3 set -e |
4 set -x |
4 set -x |
5 |
5 |
6 # skip commit logs |
6 # skip commit logs |
7 export HGMERGE=tkmerge |
7 HGMERGE=tkmerge; export HGMERGE |
8 export EDITOR=true |
8 EDITOR=true; export EDITOR |
9 |
9 |
10 rm -rf m m1 m2 |
10 rm -rf m m1 m2 |
11 mkdir m |
11 mkdir m |
12 cd m |
12 cd m |
13 |
13 |