bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file

[Dmitry Gutov]

On 04/21/2015 04:06 AM, Stefan Monnier wrote:
> > Then my vote is for using "git add FILE" with conflicts during a
> > merge, and "git reset HEAD FILE" with conflicts during "stash pop".
> > I think this is the simplest solution and is easy to implement with
> > minimal changes.
>
> Fine by me,

I've pushed this, together with the choosing logic suggested previously. 
Apparently it's the best we can do.