[MERGE] Convert tests.blackbox.test_merge to use internals where appropriate

[Daniel Watkins]

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

Attached is a fix for tests.blackbox.test_merge.

- --
Daniel Watkins (Odd_Bloke)
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGuSJu3arasOikFPYRAn6+AJ9Pu2QRrb7hqKn/ImjIAFNp1yutSACeOSWw
T3fnhz5fb9P6GFtze751bGA=
=3Y4D
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: merge.blackbox_fix.bundle
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070808/f5ffa5b6/attachment-0001.diff