Mercurial > emacs

changeset 70883:910efa724a98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict indicators.
author Chong Yidong <cyd@stupidchicken.com>
date Wed, 24 May 2006 14:25:50 +0000
parents c5d2bd581ee7
children c115536c8ae7
files lisp/ChangeLog
diffstat 1 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed May 24 14:21:52 2006 +0000
+++ b/lisp/ChangeLog	Wed May 24 14:25:50 2006 +0000
@@ -947,12 +947,10 @@
 	than alias `list-diary-entries'.
 
 2006-04-29  Dan Nicolaescu  <dann@ics.uci.edu>
->>>>>>> 1.9511
-
-<<<<<<< ChangeLog
+
 	* jit-lock.el (jit-lock-function): Check jit-lock-defer-timer is
 	active before setting 'fontified to 'defer.
-=======
+
 	* help-fns.el (describe-variable): Add info about safe local variables.
 
 2006-04-29  Richard Stallman  <rms@gnu.org>
@@ -2211,7 +2209,6 @@
 
 	* term/w32-win.el (mouse-set-font):
 	Mention w32-list-proportional-fonts in the doc string.
->>>>>>> 1.9511
 
 2006-03-18  Kim F. Storm  <storm@cua.dk>