diff lisp/ChangeLog @ 32959:846bba8718d8

(vc-cvs-merge-news): Be prepared for no news at all.
author André Spiegel <spiegel@gnu.org>
date Fri, 27 Oct 2000 15:07:46 +0000
parents cf85013860f1
children 831149d9d733
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Oct 27 14:58:46 2000 +0000
+++ b/lisp/ChangeLog	Fri Oct 27 15:07:46 2000 +0000
@@ -11,7 +11,8 @@
 	* vc-cvs.el (vc-cvs-checkin): Check both status and error message 
 	after command.  If there's an unexpected error, signal it instead 
 	of being silent.
-
+	(vc-cvs-merge-news): Be prepared for no news at all.
+	
 2000-10-27  Miles Bader  <miles@lsi.nec.co.jp>
 
 	* shell.el (shell): Add BUFFER argument.