equal
deleted
inserted
replaced
205 abort: can only specify three labels. |
205 abort: can only specify three labels. |
206 [255] |
206 [255] |
207 |
207 |
208 binary file |
208 binary file |
209 |
209 |
210 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
210 $ $PYTHON -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
211 $ cat orig >> binary-local |
211 $ cat orig >> binary-local |
212 $ python simplemerge -p binary-local base other |
212 $ python simplemerge -p binary-local base other |
213 warning: binary-local looks like a binary file. |
213 warning: binary-local looks like a binary file. |
214 [1] |
214 [1] |
215 |
215 |