[merge] Make merge internals private

[Aaron Bentley]

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

Hi all,

I'd like to replace the merge internals with the Transactional Tree
Transform code when it's properly baked.  In order to avoid breaking API
compatibility later, Robert Collins suggested I make the internals
private now.  So I've done that.

http://panoramicfeedback.com/opensource/bzr/bzr.ab/

P.S. I've started work on merging via Transactional Tree Transform.  So
far, so good.

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

iD8DBQFDzV600F+nu1YWqI0RApj9AJ9JlgpJMi0autjvlSsVy9NgRdUOJQCfWlX6
tXyA3o9+D/SfrPGnL/9tCNM=
=5+Fi
-----END PGP SIGNATURE-----