| changeset 33286 | 2428e8ec0793 |
| parent 22896 | 7e9cbb9c6053 |
| child 33721 | 24849d53697d |
| 33285:98f6c25aaf61 | 33286:2428e8ec0793 |
|---|---|
3 |
3 |
4 $ cat <<EOF > merge |
4 $ cat <<EOF > merge |
5 > import sys, os |
5 > import sys, os |
6 > print "merging for", os.path.basename(sys.argv[1]) |
6 > print "merging for", os.path.basename(sys.argv[1]) |
7 > EOF |
7 > EOF |
8 $ HGMERGE="python ../merge"; export HGMERGE |
8 $ HGMERGE="$PYTHON ../merge"; export HGMERGE |
9 |
9 |
10 Creating base: |
10 Creating base: |
11 |
11 |
12 $ hg init a |
12 $ hg init a |
13 $ cd a |
13 $ cd a |