Mercurial > emacs
diff lisp/ChangeLog @ 111267:7f0afd30f764
More merge fixes.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 31 Oct 2010 19:38:16 +0100 |
parents | 8da6c861bf9f |
children | a8ba29b9ad19 |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 31 11:26:54 2010 -0700 +++ b/lisp/ChangeLog Sun Oct 31 19:38:16 2010 +0100 @@ -30,7 +30,7 @@ 2010-10-31 Aaron S. Hawley <aaron.s.hawley@gmail.com> - * add-log.el (find-change-log): Use derived-mode-p rather than + * vc/add-log.el (find-change-log): Use derived-mode-p rather than major-mode (bug#7284). 2010-10-31 Glenn Morris <rgm@gnu.org>