[PATCH] Merge needs no BASE_SPEC, better docs

[Aaron Bentley]

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

Johan Rydberg wrote:
> Aaron Bentley <aaron.bentley at utoronto.ca> writes:
> 
> 
>>This patch makes the BASE_SPEC parameter of the 'merge' command
>>optional.  
> 
> 
> 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.

Hey, I never claimed it was user-friendly. :-)

Okay, I'll make sure to fix this.  I'll also make merge abort if there
are local changes in the tree.

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

iD8DBQFClUCa0F+nu1YWqI0RAo/XAJ9mt+iUSGIGX6xQC0uKEOKQl21gsACfXje2
/xzxyG/O4uCEzWyWlWPtVsQ=
=+oPm
-----END PGP SIGNATURE-----