aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e1e3a6e21..8bffdf12c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 <[email protected]>
* shell.el (shell): Add BUFFER argument.