Try checking out the version already in HEAD: git checkout -- lisp/ox-html.el
Then pull again. Nathan DeGruchyI update org daily (at least I try to) using make-update2 in Cygwin git.Today I received the following message- - - - begin message - - - -rm -fgit checkoutD contrib/lisp/ob-groovy.elM contrib/lisp/ob-oz.elM contrib/lisp/org-mac-link.elM lisp/ob-C.elD lisp/ob-J.elM lisp/ob-latex.elM lisp/ob-maxima.elM lisp/org-agenda.elM lisp/org-element.elM lisp/org-habit.elM lisp/org-inlinetask.elM lisp/org-table.elM lisp/org.elM lisp/ox-html.elM lisp/ox-latex.elM lisp/ox-texinfo.elM lisp/ox.elM testing/lisp/test-ob.elM testing/lisp/test-ox.elYour branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.git remote updateFetching originFrom git://orgmode.org/org-mode 13bb116..6e51188 master -> origin/master 1a3591c..03ce57e maint -> origin/maintgit pullerror: Your local changes to the following files would be overwritten by merge: lisp/ox-html.elPlease, commit your changes or stash them before you can merge.AbortingUpdating e23bbda..6e51188mk/targets.mk:111: recipe for target 'up0' failedmake: *** [up0] Error 1- - - - end message - - - -I have not opened ox-html.el and I do not export to html. (I do export to LaTeX.)GNU Emacs 24.3.1 (i386-mingw-nt6.0.6002) of 2013-03-17 on MARVINOrg-mode version 8.2.4 (release_8.2.4-357-gda05ab.dirty @ c:/cygwin/home/owner/.elisp/org-mode/lisp/)Charlie Millar---This email is free from viruses and malware because avast! Antivirus protection is active.http://www.avast.com
|