[merge] cleanup remerge tests

[Aaron Bentley]

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

John Arbash Meinel wrote:
> So I went ahead and updated the remerge tests, moving them into their
> own file, and writing run_bzr_error to make it nicer to verify we are
> getting the error we expect.

+1.  It's nice to get run_bzr_error in there, though I think it should
default to retcode=3, because that's our error retcode.

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

iD8DBQFEpAIs0F+nu1YWqI0RAoe1AJ986avQQkVzTt0YQv6nMC3wwVImpgCbB8qs
k5F1+G+GdpGLZqFKWOqdZbQ=
=GcZt
-----END PGP SIGNATURE-----