[bzrtools/MERGE] Fix erroring test.

[Aaron Bentley]

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

Vincent Ladeuil wrote:
> A bit surprising but trivial to fix,

Thanks, applied.

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

iD8DBQFINbhb0F+nu1YWqI0RAjipAJ9Mf8cBJSlpQpXrEjODsoIduBurCACfcEIQ
JkESoGPSAabDIRxv3+v1fZY=
=qqYQ
-----END PGP SIGNATURE-----