HCoop Git - bpt/emacs.git/commit - admin/ChangeLog

HCoop / bpt / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: e8c0613) | patch

author	Glenn Morris <rgm@gnu.org>
	Sat, 21 May 2011 21:19:30 +0000 (14:19 -0700)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 21 May 2011 21:19:30 +0000 (14:19 -0700)
commit	2a35386df43842ade192a4f5fea5a412cf0d8d29
tree	6fd8dc56af5f43b7608057d555227ad20c096868	tree \| snapshot (tar.gz zip)
parent	e8c061395d487b1373b7e19fa1c64fdf6d5cfd91	commit \| diff

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

admin/ChangeLog		diff \| blob \| blame \| history
admin/bzrmerge.el		diff \| blob \| blame \| history

Unnamed repository; edit this file 'description' to name the repository.