diff ChangeLog @ 34840:509ed3724af0

(smerge-basic-map): Use `=' rather than `d'. Use minibuffer menu prompt for the `=' prefix. (smerge-command-prefix): Change default to C-^.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 22 Dec 2000 22:58:57 +0000
parents a75e9cf7a2e3
children 4a9557e39356
line wrap: on
line diff