--- a/tests/test-simplemerge-cmd.t	Mon May 09 10:46:54 2011 +0200
+++ b/tests/test-simplemerge-cmd.t	Fri May 13 19:46:36 2011 -0500
@@ -99,8 +99,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