[MERGE][BUG #151731] Alternative Cherrypicking merges

[James Westby]

On Tue, 2008-03-11 at 17:26 -0500, John Arbash Meinel wrote:
> 
> THIS    BASE    OTHER
> a	a	a
> b	b	b	
> q	c	c
> 	d	d
> 	e	f
> 		e
> 		g

Hi John,

Thanks for the detailed clarification. I was only thinking of
BASE adding lines to THIS, so I just couldn't see what the
desired output was.

Your explanations all look good to me.

Thanks,

James