# HG changeset patch
# User Sune Foldager <cryo@cyanite.org>
# Date 1305537246 -7200
# Node ID 473d0aaf765544020e53fe62d556c5fd519c00c4
# Parent  abaacdab38f64e3f7f27d8bc6ec251c76dfcc30e
fix test broken in merge from stable

diff -r abaacdab38f6 -r 473d0aaf7655 tests/test-contrib.t
--- 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