[MERGE] improved help text for remerge, merge

[Aaron Bentley]

Hi all,

I've updated the help text for remerge, to try to be a bit more, well, 
helpful.  And I've added a list of merge types to the bottom of the 
merge command.

I've attached a bzr changeset.  I've done a bunch of work on changesets, 
and they're getting close to mergeable.  If you want to try them out, 
the branch is here:
http://code.aaronbentley.com/bzr/bzrrepo/others/w-changeset/

Aaron
-------------- next part --------------
A non-text attachment was scrubbed...
Name: remerge-help.patch
Type: text/x-patch
Size: 4292 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060519/1fdade7f/attachment.bin