# HG changeset patch # User Thomas Arendsen Hein # Date 1176979675 -7200 # Node ID c6413f8f2f8e5b0f8c308e80a6c6dea381c590ee # Parent 390d110a57b856834b83d4581d1eb2234d704bcb Use python instead of shell printf with \x for test-simplemerge-cmd Needed e.g. to be compatible with Solaris. diff --git a/tests/test-simplemerge-cmd b/tests/test-simplemerge-cmd --- 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