* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 853c194..7aaeb1d 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-21  Glenn Morris  <rgm@gnu.org>
+
+       * bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.3 released.