Show More
@@ -201,7 +201,7 b' too many labels' | |||||
201 |
|
201 | |||
202 | binary file |
|
202 | binary file | |
203 |
|
203 | |||
204 |
$ $PYTHON -c "f = |
|
204 | $ $PYTHON -c "f = open('binary-local', 'w'); f.write('\x00'); f.close()" | |
205 | $ cat orig >> binary-local |
|
205 | $ cat orig >> binary-local | |
206 | $ $PYTHON simplemerge -p binary-local base other |
|
206 | $ $PYTHON simplemerge -p binary-local base other | |
207 | warning: binary-local looks like a binary file. |
|
207 | warning: binary-local looks like a binary file. |
General Comments 0
You need to be logged in to leave comments.
Login now