##// END OF EJS Templates
Use python instead of shell printf with \x for test-simplemerge-cmd...
Thomas Arendsen Hein -
r4367:c6413f8f default
parent child Browse files
Show More
@@ -42,7 +42,7 b" echo '% too many labels'"
42 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
42 python simplemerge -p -L foo -L bar -L baz conflict-local base conflict-other
43
43
44 echo '% binary file'
44 echo '% binary file'
45 printf '\x00' > binary-local
45 python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()"
46 cat orig >> binary-local
46 cat orig >> binary-local
47 python simplemerge -p binary-local base other
47 python simplemerge -p binary-local base other
48
48
General Comments 0
You need to be logged in to leave comments. Login now