Try checking out the version already in HEAD: git checkout -- lisp/ox-html.el

Then pull again. 

Nathan DeGruchy

nathan@degruchy.org

This email is free from viruses and malware because avast! Antivirus protection is active.