]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7884cd3) | patch
(smerge-ediff): Autoload.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Oct 2002 17:30:20 +0000 (17:30 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 10 Oct 2002 17:30:20 +0000 (17:30 +0000)
commita48402c999f3600e8a6ba63c6fa246e223db138c
tree9fa5b397d33f4c6c9aa61a49511eb5023246b8d7tree | snapshot
parent7884cd32d0eace418d11f5b478f5dda2bd04be99commit | diff
(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.
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.