Mercurial > emacs
diff mac/makefile.MPW @ 87785:8f1628da223f
* 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 | 107ccd98fa12 |
children | 606f2d163a64 |