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

[Dmitry Gutov]

On 05/14/2015 10:33 PM, Eli Zaretskii wrote:

> Ask the user whether to reset each file in the index (other than the
> one in which the conflicts were resolved), perhaps?

That doesn't sound to me like something an after-save-hook should do.

And we can't reset each other file, we'd first have to check whether 
some of them still conflicts.