Mercurial > hg
comparison tests/test-merge1.t @ 33286:2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
This time ones that are prefixed with =, ", ', or `. This appears to
be the last of them.
Differential Revision: https://phab.mercurial-scm.org/D14
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 20 Jun 2017 17:31:18 -0400 |
| parents | 1e4512eac59e |
| children | 24849d53697d |
comparison
equal
deleted
inserted
replaced
| 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 |