Mercurial > emacs
comparison FTP @ 34842:f05ec8dfc452
(smerge-basic-map): Use `=' rather than `d'.
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
(smerge-mode): Don't assume font-lock doesn't move point.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 22 Dec 2000 23:16:22 +0000 |
parents | 12804af3c315 |
children | cb7b83e13a02 |
comparison
equal
deleted
inserted
replaced
34841:43f31a211e9b | 34842:f05ec8dfc452 |
---|