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

[Alexander Belchenko]

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

Daniel Watkins пишет:
> On Thu, 2007-08-23 at 12:01 -0400, Aaron Bentley wrote:
>> ^^^ tuples, lists, etc, don't generally have spaces after trailing
>> commas.  No PEP8 on that, but repr(('hello', )) produces "('hello',)"
> Fixed in attached.

bb:approve


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

iD8DBQFG2unnzYr338mxwCURAq6FAKCJ679YtCyced5bcjUM/yVXTGozdACfT06z
AsVR/lNGJE9+onlim9CJtb4=
=OWdq
-----END PGP SIGNATURE-----