Mercurial > emacs
comparison lisp/cus-edit.el @ 47827:9d7b63dcf005
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Thu, 10 Oct 2002 17:30:20 +0000 |
| parents | 4649d9cb92dd |
| children | dd12a68149b5 |
comparison
equal
deleted
inserted
replaced
| 47826:d3a763e7e7d3 | 47827:9d7b63dcf005 |
|---|