Mercurial > emacs
comparison lisp/org/ob-C.el @ 112271:8f641c1fc9cc
bzrmerge.el trivia.
* admin/bzrmerge.el (bzrmerge-missing): Add another skip indicator.
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sat, 15 Jan 2011 12:42:23 -0800 |
parents | a7740098b594 |
children | 6378d1b57038 |
comparison
equal
deleted
inserted
replaced
112270:cc0887b67703 | 112271:8f641c1fc9cc |
---|