Mercurial > emacs

diff admin/ChangeLog @ 112271:8f641c1fc9cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 41f5a96a1e35
children 140dad9214ac
line wrap: on
line diff
--- a/admin/ChangeLog	Sat Jan 15 12:38:27 2011 -0800
+++ b/admin/ChangeLog	Sat Jan 15 12:42:23 2011 -0800
@@ -1,3 +1,8 @@
+2011-01-15  Glenn Morris  <rgm@gnu.org>
+
+	* bzrmerge.el (bzrmerge-missing): Add another skip indicator.
+	(bzrmerge-resolve): Also ignore cl-loaddefs.el.
+
 2011-01-14  Glenn Morris  <rgm@gnu.org>
 
 	* admin.el (set-copyright): Also handle \year in refcards/*.tex.