Mercurial > emacs
diff src/getloadavg.c @ 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 | 750db9f3e6d8 |
children | ef719132ddfa 7df2e30d72ec |