diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-10 17:30:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-10 17:30:20 +0000 |
| commit | a48402c999f3600e8a6ba63c6fa246e223db138c (patch) | |
| tree | 9fa5b397d33f4c6c9aa61a49511eb5023246b8d7 /lisp/emacs-lisp | |
| parent | 7884cd32d0eace418d11f5b478f5dda2bd04be99 (diff) | |
| download | emacs-a48402c999f3600e8a6ba63c6fa246e223db138c.tar.gz emacs-a48402c999f3600e8a6ba63c6fa246e223db138c.tar.bz2 emacs-a48402c999f3600e8a6ba63c6fa246e223db138c.zip | |
(smerge-ediff): Autoload.
(smerge-match-conflict): Don't assume as much about smerge-begin-re.
(smerge-resolve-function): New var.
(smerge-resolve): New command.
(smerge-basic-map): Bind it.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions