[MERGE][bug #235715] bzr merge --lca should handle NULL as a base

[Aaron Bentley]

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

John Arbash Meinel wrote:
> This just updates the merge code so that if it gets NULL_REVISION it
> recognizes
> that it should be treated as just an empty text.

bb:approve

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

iD8DBQFIPwLc0F+nu1YWqI0RAjyqAJ9MoGyNhlnMLbOVZnOSLdxkng/5jQCdHofh
kgvna5ZFXra5WWz7FPTzRaw=
=zLBj
-----END PGP SIGNATURE-----