]> git.eshelyaron.com Git - emacs.git/commit
* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
authorGlenn Morris <rgm@gnu.org>
Sat, 21 May 2011 21:19:30 +0000 (14:19 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 21 May 2011 21:19:30 +0000 (14:19 -0700)
commit2a35386df43842ade192a4f5fea5a412cf0d8d29
tree6fd8dc56af5f43b7608057d555227ad20c096868
parente8c061395d487b1373b7e19fa1c64fdf6d5cfd91
* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
admin/ChangeLog
admin/bzrmerge.el