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

[Aaron Bentley]

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

bb:tweak

The functionality looks good, just some formatting stuff.

Daniel Watkins wrote:
> +    def example_branch(self, path='.'):
> +        tree = self.make_branch_and_tree(path)
> +        self.build_tree_contents([
> +            (pathjoin(path, 'hello'),   'foo'),
> +            (pathjoin(path, 'goodbye'), 'baz')])


^^^ Please don't try to line things up like this.

> +        self.build_tree_contents([
> +            ('a/',                   ),
> +            ('a/sub/',               ),
> +            ('a/sub/a.txt', 'hello\n'),
> +            ('a/b.txt',     'hello\n'),
> +            ('a/sub/c.txt', 'hello\n')])

^^^ Please don't try to line things up like this.

n_workingtree()
> +        self.build_tree_contents([
> +            ('a/sub/a.txt', 'hello\nthere\n'),
> +            ('a/b.txt',     'hello\nthere\n'),
> +            ('a/sub/c.txt', 'hello\nthere\n')])

^^^ Please don't try to line things up like this.

> +        a_tree.commit(message='Removed a.txt')
> +        self.build_tree_contents([
> +            ('b/sub/a.txt', 'hello\nsomething\n'),
> +            ('b/b.txt',     'hello\nsomething\n'),
> +            ('b/sub/c.txt', 'hello\nsomething\n')])

^^^ Please don't try to line things up like this.

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

iD8DBQFGzago0F+nu1YWqI0RAtpHAJ45pNHGOGCpoSwkp0AqOghyJhqCmgCePAaV
KFzRdYoGFNfWyHpHIxnouv8=
=W1VG
-----END PGP SIGNATURE-----