Mercurial > emacs

diff lisp/ediff-util.el @ 87785:8f1628da223f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* smerge-mode.el (smerge-start-session): Rename from smerge-auto. * pcvs.el (cvs-revert-if-needed): * vc.el (vc-maybe-resolve-conflicts): Rename callers. * vc-svn.el (vc-svn-find-file-hook): * vc-arch.el (vc-arch-find-file-hook): Undo previous change.
author Dan Nicolaescu <dann@ics.uci.edu>
date Wed, 16 Jan 2008 06:22:59 +0000
parents f2c8fd594360
children c70e45a7acfd 5fc145fcebe2
line wrap: on
line diff