equal
deleted
inserted
replaced
199 abort: can only specify three labels. |
199 abort: can only specify three labels. |
200 [255] |
200 [255] |
201 |
201 |
202 binary file |
202 binary file |
203 |
203 |
204 $ $PYTHON -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
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. |
208 [1] |
208 [1] |
209 |
209 |