diff etc/HELLO @ 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 183f7913ab90
children af4b46d3b81f
line wrap: on
line diff