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

[Dmitry Gutov]

On 05/14/2015 09:52 PM, Eli Zaretskii wrote:

> I think its a good idea.

It might be. But I don't actually know how to approach it.

Doing 'git reset' right after a stash is popped would break 
vc-git-conflicted-files.

If we don't do that, then what else *do* we do in vc-git-stash-apply and 
vc-git-stash-pop?

Note that vc-git-resolve-when-done has to work satisfactorily both after 
vc-git-stash-apply, and after 'git stash apply' performed in console.