On Mon, Jun 11, 2012 at 03:50:29PM +0100, Lee Jones wrote:
> On 11/06/12 15:27, Mark Brown wrote:

> >It'll merge out fine, it's just icky having the same thing appear twice
> >in history.  Not the end of the world.

> Understood. So does this mean you will to push them into the -rcs?

Yes.