| changeset 33286 | 2428e8ec0793 |
| parent 29480 | 1e4512eac59e |
| child 33721 | 24849d53697d |
| 33285:98f6c25aaf61 | 33286:2428e8ec0793 |
|---|---|
8 > except ImportError: |
8 > except ImportError: |
9 > pass |
9 > pass |
10 > |
10 > |
11 > print "merging for", os.path.basename(sys.argv[1]) |
11 > print "merging for", os.path.basename(sys.argv[1]) |
12 > EOF |
12 > EOF |
13 $ HGMERGE="python ../merge"; export HGMERGE |
13 $ HGMERGE="$PYTHON ../merge"; export HGMERGE |
14 |
14 |
15 $ hg init t |
15 $ hg init t |
16 $ cd t |
16 $ cd t |
17 $ echo This is file a1 > a |
17 $ echo This is file a1 > a |
18 $ hg add a |
18 $ hg add a |