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

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/01/13 20:03:37

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.12568
retrieving revision 1.12569
diff -u -b -r1.12568 -r1.12569
--- ChangeLog   13 Jan 2008 18:18:12 -0000      1.12568
+++ ChangeLog   13 Jan 2008 20:03:35 -0000      1.12569
@@ -1,3 +1,11 @@
+2008-01-13  Dan Nicolaescu  <address@hidden>
+
+       * vc.el (vc-update): Resolve conflicts if necessary instead of
+       just updating the buffer.
+
+       * vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
+       update command so that we can parse the output.
+
 2008-01-13  Martin Rudalics  <address@hidden>
 
        * mail/rmail.el (rmail-convert-to-babyl-format): Remove