Your bug report

#7152: vc-update fails under conflicts (bug#4280)

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 7152@debbugs.gnu.org.

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