Mercurial > emacs

diff lisp/ChangeLog.3 @ 47827:9d7b63dcf005

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 fc4a17f3d810
children 1aba10ab73b4
line wrap: on
line diff