[merge] Make merge internals private

[Aaron Bentley]

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

John Arbash Meinel wrote:
> For some reason, merging your branch takes *way* too long. On my fast
> machine it takes 10 minutes to do the merge. On my older machine, I
> killed it after about 15 minutes, but I'll run again to see how long it
> takes. (It seems to spend its time in Weave._extract() considering what
> happened when I canceled it)

I've done quite a few uncommits in my time.  Perhaps that's the cause.

I've fixed the import problems I could see.  So feel free to integrate it.

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

iD8DBQFD1kog0F+nu1YWqI0RApOIAJ4yWSkfos9ZJfeMnWPOQiRRmc5wlgCeIw1M
wy0QrF24TnY1RVUNkVHpBHc=
=j0RU
-----END PGP SIGNATURE-----