summaryrefslogtreecommitdiff
path: root/lisp/smerge-mode.el
Commit message (Expand)AuthorAgeFilesLines
...
* (smerge-auto-leave): New function and variable.Stefan Monnier2000-03-221-41/+40
* New file. Provides a simple minor-mode for files containingStefan Monnier1999-12-091-0/+453