# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 2011-05-16 09:14:06
# Node ID 473d0aaf765544020e53fe62d556c5fd519c00c4
# Parent  abaacdab38f64e3f7f27d8bc6ec251c76dfcc30e

fix test broken in merge from stable

diff --git a/tests/test-contrib.t b/tests/test-contrib.t
--- a/tests/test-contrib.t
+++ b/tests/test-contrib.t
@@ -229,8 +229,8 @@ binary file
   $ 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