[bzrtools:MERGE] Fix erroring test, the right way.

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Vincent Ladeuil wrote:
> I was surprised when the test failed, but far less surprised than
> when I thought I fixed it and realized it was failing in another
> way.
> 
> Moral: never ever tweak after selftest or face the consequences.

Your patch isn't against the latest version of bzrtools and doesn't
apply cleanly.  Please update and see if it's still necessary.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFINs270F+nu1YWqI0RAnf3AJ4mE0wLMIFLHQXOHfzpEUzzS6IXIACfSLoX
V9CJCmx+YRihDD5uzl/zRWc=
=rL5r
-----END PGP SIGNATURE-----