Mercurial > emacs

comparison src/process.c @ 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 62a08cd28e83
children b30942bd85f3
comparison
equal deleted inserted replaced
47779:d53b71650f3b 47780:27caec378c23