]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8772b5a) | patch
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
authorDan Nicolaescu <dann@ics.uci.edu>
Wed, 16 Jan 2008 06:22:59 +0000 (06:22 +0000)
committerDan Nicolaescu <dann@ics.uci.edu>
Wed, 16 Jan 2008 06:22:59 +0000 (06:22 +0000)
commit28e4e2b434e3574f01b69c585dcccaecde6c940f
treed53753a8d53617c9b9221d8f7bca31d78fdff120tree | snapshot
parent8772b5a8566ddab4aea41c6bd24d4498f56f793bcommit | diff
* 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.
lisp/ChangeLog diff | blob | history
lisp/pcvs.el diff | blob | history
lisp/smerge-mode.el diff | blob | history
lisp/vc-arch.el diff | blob | history
lisp/vc-svn.el diff | blob | history
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.