[merge] cleanup remerge tests

[Aaron Bentley]

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

John Arbash Meinel wrote:
> So how about if I add:
> 
> kwargs.setdefault('retcode', 3)
> 
> I would be okay with that. I added a test case for 'run_bzr_error', see
> the new bundle.

Sweet.  I'll have to remember setdefault.

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

iD8DBQFEpAqP0F+nu1YWqI0RAmFjAJ9G/lDcI0JyqeRwvHKaakHlcUKY5QCfX35p
bGbX6eBaOvRgFuFB+fL2VBo=
=qkxa
-----END PGP SIGNATURE-----