[MERGE] Convert test.blackbox.test_c* to use internals where appropriate

[Daniel Watkins]

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

Attached are fixed for tests.blackbox.test_cat,
tests.blackbox.test_commit and tests.blackbox.test_conflicts.

- --
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

iD8DBQFGuFU63arasOikFPYRAto0AKC5I7663PxfPuOVYK4uPEjPaDwc1ACfSlYE
Sb+lOhmuwXpGaPbkO37I7yg=
=Cz0i
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: c.blackbox_fix.bundle
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20070807/8fe1283c/attachment.diff