[PATCH] Merge needs no BASE_SPEC, better docs

[Erik Bågfors]

Wow.. you rock :)

/Erik

On 5/25/05, Aaron Bentley <aaron.bentley at utoronto.ca> wrote:
> -----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!
>