[MERGE] rip off the trailing whitespace band-aid

[Aaron Bentley]

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

Marius Kruger wrote:
>     Did you hand-hack the merge directive at all?
> 
> no, I created it with the above command.
> When this wasn't processed I sent a merge directive including
> everything, which did seem to get processed.

Weird.

> Does BB support merge directives with --no-bundle, --no-patch and only a
> public SUBMIT_BRANCH and PUBLIC_BRANCH ?

Yes.

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

iEYEARECAAYFAkl1BvEACgkQ0F+nu1YWqI1/jQCeNZSwlPRTOBnjXQ9a/CfUaMas
j8UAoIEwR76oRt+doU2WAJXN4VFgR3qu
=lGzV
-----END PGP SIGNATURE-----