[PATCH] Merge needs no BASE_SPEC, better docs

[Aaron Bentley]

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

Hi,

This patch makes the BASE_SPEC parameter of the 'merge' command
optional.  If the BASE_SPEC is not supplied, the latest common ancestor
of './@' and OTHER_SPEC is used.  It also adds some decent inline
documentation of merge.

This patch does about 4 different things, so I can generate several
different patches if that's preferred.

On the other hand... Hey, test cases!

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

iD8DBQFClOnL0F+nu1YWqI0RAme0AJwMtyPdMmscETalbZocdi9gDKkWTwCghSDj
KRSdx03T2YEVzNZLQ4itr10=
=y7EK
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: no-base.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20050525/f4413229/attachment.diff