Mercurial > public > mercurial-scm > hg-stable

diff tests/test-contrib.t @ 14330:473d0aaf7655

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix test broken in merge from stable
author Sune Foldager <cryo@cyanite.org>
date Mon, 16 May 2011 11:14:06 +0200
parents 33e04d3d17f6
children 9910f60a37ee
line wrap: on
line diff
--- 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