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

[Stefan Monnier]

>> and AFAIK those cases can't be distinguished solely based on the
>> state of the current file but also depend on the other files in
>> the project.
> That's not a problem, we have vc-git-root.

It's not a theoretical problem, no, but it's a practical/programming
problem in that someone has to write the code, and the resulting code
will be that much more brittle and inefficient.


        Stefan