comparison etc/DISTRIB @ 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 3e47b3d08800
children 80973470ed3e d7ddb3e565de
comparison
equal deleted inserted replaced
34841:43f31a211e9b 34842:f05ec8dfc452