[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Dan Nicolaescu]

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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12581
retrieving revision 1.12582
diff -u -b -r1.12581 -r1.12582
--- ChangeLog   16 Jan 2008 04:13:44 -0000      1.12581
+++ ChangeLog   16 Jan 2008 06:22:59 -0000      1.12582
@@ -1,3 +1,12 @@
+2008-01-16  Dan Nicolaescu  <address@hidden>
+
+       * 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.
+
 2008-01-16  Ulf Jasper  <address@hidden>
 
        * calendar/icalendar.el (icalendar-version): Increase to 0.16.