* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
commit23c726f65afecf33df75e5c62d5d930e0d672f01
authorGlenn Morris <rgm@gnu.org>
Fri, 10 Aug 2012 06:57:34 +0000 (9 23:57 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 10 Aug 2012 06:57:34 +0000 (9 23:57 -0700)
treef3006f2ac2b300be0eaaa3c9f9261262922c54ff
parentfbb5e3364871172431e32b4b722d1e1fd6312330
* admin/bzrmerge.el (bzrmerge-resolve): Disable local eval:.
admin/ChangeLog
admin/bzrmerge.el