[merge] fix up and enforce style of option help

[Aaron Bentley]

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

Martin Pool wrote:
>> This is an API break.  Those orphaned global options may be in use by
>> plugins-- for example, "message" is used by "shelve".
> 
> Yes I'd noticed that too.  I might revert the removal of the options
> and the test that requires that they be used.

Bzrtools has already adapted, so it doesn't matter to me.  Though it did
cause some confusion this morning.

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

iD8DBQFGlrqr0F+nu1YWqI0RAtORAJkBGTbYc4PPQpcUX6QU1Q4dY5gBTwCcDd4G
+oTZdi221W5Gd8wMUUzfHtE=
=VYCw
-----END PGP SIGNATURE-----