log lisp/ChangeLog @ 87743:c2a952d12e21

age author description
Mon, 14 Jan 2008 07:38:05 +0000 Dan Nicolaescu * smerge-mode.el (smerge-auto): New function.