| commit | 28e4e2b434e3574f01b69c585dcccaecde6c940f | |
| author | Dan Nicolaescu <dann@ics.uci.edu> | |
| Wed, 16 Jan 2008 06:22:59 +0000 (16 06:22 +0000) | ||
| committer | Dan Nicolaescu <dann@ics.uci.edu> | |
| Wed, 16 Jan 2008 06:22:59 +0000 (16 06:22 +0000) | ||
| tree | d53753a8d53617c9b9221d8f7bca31d78fdff120 | treesnapshot (tar.gz zip) |
| parent | 8772b5a8566ddab4aea41c6bd24d4498f56f793b | commitdiff |
* 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.
* 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.