Mercurial > emacs

diff src/syntax.h @ 47780:27caec378c23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts in case some other package redefined it. (vc-resolve-conflicts): Make it into an alias for smerge-ediff.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 07 Oct 2002 16:24:42 +0000
parents 40db0673e6f0
children 23a1cea22d13
line wrap: on
line diff