Re: git cherry-pick conflict error message is deceptive when cherry-picking multiple commits

Instead of expanding I'd go for replacing?

I'd say the user is tempted for 2 choices, a) aborting (for various reasons) b) fix and continue.

So we'd want to point out the way for those two ways and not give an additional arbitrary way that is not quite (b) but goes that direction?

I realize this is what the patch does, but I wanted to point out the difference on expanding vs replacing. I think a 4 line hint is "enough", so I'd object adding more lines, but changing existing lines is great!