Your bug report

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

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to 20292@debbugs.gnu.org.

-- 
20292: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=20292
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems