diff options
| author | Stefan Monnier | 2000-12-22 23:19:47 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2000-12-22 23:19:47 +0000 |
| commit | 6eabfb2600e07362acc22f6ffcdc35e1cc758eb0 (patch) | |
| tree | d5780fffd5c40681baf862bd779906049407b7c7 /src/ChangeLog | |
| parent | 0e86b6b04b7700833e139303e311ae7a8c4088a3 (diff) | |
| download | emacs-6eabfb2600e07362acc22f6ffcdc35e1cc758eb0.tar.gz emacs-6eabfb2600e07362acc22f6ffcdc35e1cc758eb0.zip | |
(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.
Diffstat (limited to 'src/ChangeLog')
0 files changed, 0 insertions, 0 deletions