log lisp/smerge-mode.el @ 30932:80071f806f38

age author description
Wed, 16 Aug 2000 19:51:55 +0000 Stefan Monnier (smerge-mode-menu): Doc fix.
Fri, 21 Jul 2000 13:52:19 +0000 Dave Love (smerge-mode-menu): Fill it out.
Thu, 25 May 2000 18:08:26 +0000 Dave Love (smerge-diff-switches): Don't use list* in defcustom.
Wed, 22 Mar 2000 00:54:55 +0000 Stefan Monnier (smerge-auto-leave): New function and variable.
Thu, 09 Dec 1999 13:00:21 +0000 Stefan Monnier New file. Provides a simple minor-mode for files containing