diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-16 06:22:59 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-16 06:22:59 +0000 |
| commit | 28e4e2b434e3574f01b69c585dcccaecde6c940f (patch) | |
| tree | d53753a8d53617c9b9221d8f7bca31d78fdff120 /lisp/smerge-mode.el | |
| parent | 8772b5a8566ddab4aea41c6bd24d4498f56f793b (diff) | |
| download | emacs-28e4e2b434e3574f01b69c585dcccaecde6c940f.tar.gz | |
* 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.
Diffstat (limited to 'lisp/smerge-mode.el')
| -rw-r--r-- | lisp/smerge-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el index e7352c4479e..f2a7a9caf9e 100644 --- a/lisp/smerge-mode.el +++ b/lisp/smerge-mode.el @@ -1050,7 +1050,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict." (smerge-remove-props (point-min) (point-max)))) ;;;###autoload -(defun smerge-auto () +(defun smerge-start-session () "Turn on `smerge-mode' and move point to first conflict marker. If no conflict maker is found, turn off `smerge-mode'." (smerge-mode 1) |