Mercurial > emacs

diff lisp/ChangeLog @ 32644:7e334ab6c0a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Thu, 19 Oct 2000 06:58:33 +0000
parents ff0a7d57dede
children dd02ab7a6392
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Oct 19 06:58:08 2000 +0000
+++ b/lisp/ChangeLog	Thu Oct 19 06:58:33 2000 +0000
@@ -18,7 +18,6 @@
 	(comint-mode-map): Add it to the menu.
 	Bind `C-c C-s' to comint-write-output.
 
->>>>>>> 1.1299
 2000-10-18  Gerd Moellmann  <gerd@gnu.org>
 
 	* startup.el (fancy-splash-screens): Set buffer-undo-list to t.