# HG changeset patch
# User John Wiegley <johnw@newartisans.com>
# Date 992894364 0
# Node ID 514a4921c6e04ec7c3d88277011f123be0ff62a3
# Parent  e04bcf94a44174bdbc7c907cd2f7faebc9336cd3
*** empty log message ***

diff -r e04bcf94a441 -r 514a4921c6e0 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jun 18 19:04:09 2001 +0000
+++ b/lisp/ChangeLog	Mon Jun 18 19:59:24 2001 +0000
@@ -1,3 +1,8 @@
+2001-06-12  John Wiegley  <johnw@gnu.org>
+
+	* eshell/esh-mode.el: Disabled a test that often yields false
+	failures.
+
 2001-06-18  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* textmodes/sgml-mode.el (sgml-mode-map): Fix thinko.
@@ -158,6 +163,7 @@
 	* server.el (server-process, server-buffer-clients): Doc fix.
 	From Pavel Jan,Bm(Bk <Pavel@Janik.cz>.
 
+>>>>>>> 1.2419
 2001-06-09  John Wiegley  <johnw@gnu.org>
 
 	* eshell/esh-cmd.el (eshell-exit-success-p): Use a string-match to