Mercurial > hg
comparison tests/test-contrib.t @ 22947:c63a09b6b337
tests: use $PYTHON instead of hardcoding python
This makes running the testsuite with pypy possible.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Wed, 15 Oct 2014 15:35:59 -0400 |
parents | 372ae2745acf |
children | ef1eb6df7071 |
comparison
equal
deleted
inserted
replaced
22946:77c121da6143 | 22947:c63a09b6b337 |
---|---|
205 abort: can only specify three labels. | 205 abort: can only specify three labels. |
206 [255] | 206 [255] |
207 | 207 |
208 binary file | 208 binary file |
209 | 209 |
210 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" | 210 $ $PYTHON -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
211 $ cat orig >> binary-local | 211 $ cat orig >> binary-local |
212 $ python simplemerge -p binary-local base other | 212 $ python simplemerge -p binary-local base other |
213 warning: binary-local looks like a binary file. | 213 warning: binary-local looks like a binary file. |
214 [1] | 214 [1] |
215 | 215 |