log lisp/smerge-mode.el @ 33610:32bcc6e27e02

age author description
Fri, 06 Oct 2000 16:07:31 +0000 Stefan Monnier (smerge-diff): Setup the buffer's default-directory
Thu, 05 Oct 2000 06:05:51 +0000 Miles Bader (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
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