Mercurial > hg > mercurial-crew-with-dirclash
changeset 4363:c6413f8f2f8e
Use python instead of shell printf with \x for test-simplemerge-cmd
Needed e.g. to be compatible with Solaris.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 19 Apr 2007 12:47:55 +0200 |
| parents | 390d110a57b8 |
| children | 97962a3e73cf |
| files | tests/test-simplemerge-cmd |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-simplemerge-cmd +++ b/tests/test-simplemerge-cmd @@ -42,7 +42,7 @@ echo '% too many labels' python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other echo '% binary file' -printf '\x00' > binary-local +python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" cat orig >> binary-local python simplemerge -p binary-local base other