[MERGE/RFC] Merge directive support

[Aaron Bentley]

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

Nicholas Allen wrote:
> Looks like a cool idea!
>> Here's the command help:
>> usage: bzr merge-directive [SUBMIT_BRANCH] [PUBLIC_BRANCH]
>>
>> Generate a merge directive auto-merge tools.
> Shouldn't that be "Generate a merge directive *for* auto-merge tools."

Yes.  Fixed.

> Also what is the default patch type if one is not specified. It does not say in the help output... 

Bundle.  I've changed it to:

Patch type:
    --bundle            Bazaar revision bundle (default)

The rationale is that generating a bundle is less demanding for casual
users who do not want to publish a branch.

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

iD8DBQFF7Z6N0F+nu1YWqI0RAv0KAJ9VmaP9fkplVlRksdlaRtX0i+DVSQCfX7u9
aGykpKI/cEM4BhV/Xd2l6sM=
=s3ce
-----END PGP SIGNATURE-----