(smerge-basic-map): Use `=' rather than `d'.
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Dec 2000 22:59:17 +0000 (22:59 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 22 Dec 2000 22:59:17 +0000 (22:59 +0000)
commit0e86b6b04b7700833e139303e311ae7a8c4088a3
treee9af73e77dd87264024da993e231f0b4c8f61161
parentd21584d6d7dbf850a3da912be52ddda1f92e501a
(smerge-basic-map): Use `=' rather than `d'.
Use minibuffer menu prompt for the `=' prefix.
(smerge-command-prefix): Change default to C-^.
lisp/ChangeLog
lisp/smerge-mode.el