aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/smerge-mode.el (follow)
Commit message (Expand)AuthorAgeFilesLines
* New file. Provides a simple minor-mode for files containingStefan Monnier1999-12-091-0/+453