equal
deleted
inserted
replaced
97 binary file |
97 binary file |
98 |
98 |
99 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
99 $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" |
100 $ cat orig >> binary-local |
100 $ cat orig >> binary-local |
101 $ python simplemerge -p binary-local base other |
101 $ python simplemerge -p binary-local base other |
102 abort: binary-local looks like a binary file. |
102 warning: binary-local looks like a binary file. |
103 [255] |
103 [1] |
104 |
104 |
105 binary file --text |
105 binary file --text |
106 |
106 |
107 $ python simplemerge -a -p binary-local base other 2>&1 |
107 $ python simplemerge -a -p binary-local base other 2>&1 |
108 warning: binary-local looks like a binary file. |
108 warning: binary-local looks like a binary file. |