[MERGE] Merge bzr.dev

[Aaron Bentley]

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

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHabSi0F+nu1YWqI0RAk2qAJ9ZBF7mSDMySxNIruHngb1B5ZyOcwCbBVE9
Vg/hYFJynIUyF26KbVyaXhk=
=1EIk
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-CLtvGY.patch
Type: text/x-diff
Size: 4704 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071219/c0048fb5/attachment.bin