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

[Aaron Bentley]

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

Daniel Watkins wrote:
> On Thu, 2007-08-23 at 11:30 -0400, Aaron Bentley wrote:
>> The functionality looks good, just some formatting stuff.
> Fixed in attached.
> +        self.build_tree_contents([
> +            ('a/', ),

bb:tweak

^^^ tuples, lists, etc, don't generally have spaces after trailing
commas.  No PEP8 on that, but repr(('hello', )) produces "('hello',)"

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

iD8DBQFGza9H0F+nu1YWqI0RAmV1AJ9YfnzOjecLk5YFmi76vfSIP6bpIQCfbdHj
iKc+RRu8syTaYNcTiS3IIrk=
=mxc8
-----END PGP SIGNATURE-----