[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/16 06:23:01

Index: smerge-mode.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/smerge-mode.el,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- smerge-mode.el      15 Jan 2008 21:40:08 -0000      1.61
+++ smerge-mode.el      16 Jan 2008 06:22:58 -0000      1.62
@@ -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)