]> code.delx.au - gnu-emacs/history - lisp/smerge-mode.el
(custom-set-variables): Set options with :require
[gnu-emacs] / lisp / smerge-mode.el
2001-07-31 Gerd Moellmann(smerge-mode): Check if `font-lock-mode' is bound
2001-05-10 Stefan Monnier(smerge-mode): Force font-lock-multiline to t.
2001-03-07 Stefan Monnier(font-lock-keywords, font-lock-mode): Don't bind, just...
2001-01-25 Stefan Monnier(smerge-font-lock-keywords): Relax submatch 1.
2000-12-23 Stefan Monnier*** empty log message ***
2000-12-22 Stefan Monnier(smerge-basic-map): Use `=' rather than `d'.
2000-12-22 Stefan Monnier(smerge-basic-map): Use `=' rather than `d'.
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...
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 MonnierNew file. Provides a simple minor-mode for files conta...