Mercurial > emacs

changeset 43391:f346396ec985

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Pavel Janík <Pavel@Janik.cz>
date Sun, 17 Feb 2002 18:17:51 +0000
parents ce9f8721c918
children 4f1f166427e5
files lisp/ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Feb 17 18:08:44 2002 +0000
+++ b/lisp/ChangeLog	Sun Feb 17 18:17:51 2002 +0000
@@ -127,7 +127,6 @@
 	* eshell/esh-ext.el (eshell-script-interpreter): Allow whitespace
 	after the #! of a shell interpretor specification.
 
->>>>>>> 1.3466
 2002-02-15  Richard M. Stallman  <rms@gnu.org>
 
 	* help.el (describe-key-briefly): Make output in INSERT case