Mercurial > hg
changeset 14330:473d0aaf7655
fix test broken in merge from stable
| author | Sune Foldager <cryo@cyanite.org> |
|---|---|
| date | Mon, 16 May 2011 11:14:06 +0200 |
| parents | abaacdab38f6 |
| children | 3b9a896af09c |
| files | tests/test-contrib.t |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
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