| changeset 800 | ec85f9e6f3b1 |
| parent 749 | 7e4843b7efd2 |
| child 808 | 8f5637f0a0c0 |
| 799:583e290e4945 | 800:ec85f9e6f3b1 |
|---|---|
1 #!/bin/sh -x |
1 #!/bin/sh |
2 |
2 |
3 cat <<'EOF' > merge |
3 cat <<'EOF' > merge |
4 #!/bin/sh |
4 #!/bin/sh |
5 echo merging for `basename $1` |
5 echo merging for `basename $1` |
6 EOF |
6 EOF |
7 chmod +x merge |
7 chmod +x merge |
8 export HGMERGE=./merge |
8 HGMERGE=./merge; export HGMERGE |
9 |
9 |
10 mkdir A1 |
10 mkdir A1 |
11 cd A1 |
11 cd A1 |
12 hg init |
12 hg init |
13 echo This is file foo1 > foo |
13 echo This is file foo1 > foo |