Commit 2a35386d authored by Glenn Morris's avatar Glenn Morris
Browse files

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

parent e8c06139
2011-05-21 Glenn Morris <>
* bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
2011-03-07 Chong Yidong <>
* Version 23.3 released.
......@@ -146,7 +146,8 @@ are both lists of revnos, in oldest-first order."
(unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file))
(let ((exists (find-buffer-visiting file)))
(with-current-buffer (find-file-noselect file)
(with-current-buffer (let ((enable-local-variables :safe))
(find-file-noselect file))
(if (buffer-modified-p)
(error "Unsaved changes in %s" (current-buffer)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment