Mercurial > emacs

diff lisp/ChangeLog @ 67675:131310d593c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Romain Francoise <romain@orebokech.com>
date Mon, 19 Dec 2005 17:15:58 +0000
parents 947510e65020
children b7c68d3426e1
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Dec 19 15:46:13 2005 +0000
+++ b/lisp/ChangeLog	Mon Dec 19 17:15:58 2005 +0000
@@ -27,7 +27,6 @@
 	* emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for
 	lexical-let when encountering ((lambda (...) ...) ...).
 
->>>>>>> 1.8828
 2005-12-17  Chong Yidong  <cyd@stupidchicken.com>
 
 	* progmodes/sh-script.el (sh-mode):