changeset 14330 | 473d0aaf7655 |
parent 14033 | 33e04d3d17f6 |
child 15447 | 9910f60a37ee |
--- a/tests/test-contrib.t Sun May 15 13:15:41 2011 -0500 +++ b/tests/test-contrib.t Mon May 16 11:14:06 2011 +0200 @@ -229,8 +229,8 @@ $ python -c "f = file('binary-local', 'w'); f.write('\x00'); f.close()" $ cat orig >> binary-local $ python simplemerge -p binary-local base other - abort: binary-local looks like a binary file. - [255] + warning: binary-local looks like a binary file. + [1] binary file --text