[PATCH] Merge needs no BASE_SPEC, better docs

[Johan Rydberg]

Aaron Bentley <aaron.bentley at utoronto.ca> writes:

> 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.

I've tested this a bit and it seems to work pretty good.  What I'm
missing though is that "bzr merge" does not complain or anything when
there is a merge conflict.  I'm sure that's just a matter of adding
a print to the merge_conflict method.

~j