[MERGE] Merge bzr.dev

[John Arbash Meinel]

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

Aaron Bentley wrote:
> Hi all,
> 
> This patch causes bzr to warn when merging a merge directive causes a
> cherrypick.
> 
> (Somehow, I forgot to submit this, but I wrote it several days ago)
> 
> Aaron

I don't know whether this should be a "warning()" or just "note()" but
otherwise. It seems more "letting you know" than "warning you something is wrong".

bb:approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHala4JdeBCYSNAAMRAnbMAKC/HRkQ4w1ebRqrbKzKjqfuYM8+LgCeOvKH
+ASJWV6RgXoeXDiRmC1IPko=
=1Hwa
-----END PGP SIGNATURE-----