When is merge -r cherry-picking?

[Eli Zaretskii]

> From: Vincent Ladeuil <v.ladeuil+lp at free.fr>
> Cc: Eric Siegerman <lists08-bzr at davor.org>,  bazaar at lists.canonical.com
> Date: Fri, 12 Nov 2010 08:48:40 +0100
> 
> >>>>> Eli Zaretskii <eliz at gnu.org> writes:
> 
>     >> From: Eric Siegerman <lists08-bzr at davor.org>
>     >> Date: Thu, 11 Nov 2010 16:14:22 -0500
>     >> 
>     >> On Thu, 2010-11-11 at 23:00 +0200, Eli Zaretskii wrote:
>     >> > Thanks.  May I suggest to tell that explicitly in the docs?
>     >> 
>     >> lp:~eric97/bzr/fix-merge-docs
> 
>     > Thank you.  This is now crystal clear.
> 
> This is discussed here:
> https://code.edge.launchpad.net/~eric97/bzr/fix-merge-docs/+merge/40671
> 
> You're welcome to provide more input/feedback !

Done.