Your message dated Wed, 22 Apr 2015 04:50:14 +0300
with message-id <5536FE56.406@yandex.ru>
and subject line Re: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file
has caused the debbugs.gnu.org bug report #20292,
regarding 25.0.50; Smerge does "git add" for every final conflict resolution
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


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