log lisp/smerge-mode.el @ 33878:be434419d95c

age author description
2000-10-06 Stefan Monnier (smerge-diff): Setup the buffer's default-directory
2000-10-05 Miles Bader (smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):
2000-08-16 Stefan Monnier (smerge-mode-menu): Doc fix.
2000-07-21 Dave Love (smerge-mode-menu): Fill it out.
2000-05-25 Dave Love (smerge-diff-switches): Don't use list* in defcustom.
2000-03-22 Stefan Monnier (smerge-auto-leave): New function and variable.
1999-12-09 Stefan Monnier New file. Provides a simple minor-mode for files containing