Mercurial > emacs
diff lisp/smerge-mode.el @ 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 | 90318261ac4d |
| children | c70e45a7acfd ca1e1298a3d8 |
line wrap: on
line diff
--- a/lisp/smerge-mode.el Wed Jan 16 05:11:33 2008 +0000 +++ b/lisp/smerge-mode.el Wed Jan 16 06:22:59 2008 +0000 @@ -1050,7 +1050,7 @@ (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)