diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-05-21 14:19:30 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-05-21 14:19:30 -0700 |
| commit | 2a35386df43842ade192a4f5fea5a412cf0d8d29 (patch) | |
| tree | 6fd8dc56af5f43b7608057d555227ad20c096868 /lisp/emacs-lisp/lisp.el | |
| parent | e8c061395d487b1373b7e19fa1c64fdf6d5cfd91 (diff) | |
| download | emacs-2a35386df43842ade192a4f5fea5a412cf0d8d29.tar.gz emacs-2a35386df43842ade192a4f5fea5a412cf0d8d29.tar.bz2 emacs-2a35386df43842ade192a4f5fea5a412cf0d8d29.zip | |
* admin/bzrmerge.el (bzrmerge-resolve): Suppress prompts about file-locals.
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions