Mercurial > emacs

diff lisp/ChangeLog @ 58746:168cca775caf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Richard M. Stallman <rms@gnu.org>
date Fri, 03 Dec 2004 00:30:33 +0000
parents cb83859af19e
children 127015d55356
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Dec 03 00:27:43 2004 +0000
+++ b/lisp/ChangeLog	Fri Dec 03 00:30:33 2004 +0000
@@ -113,13 +113,11 @@
 
 	* man.el (Man-fontify-manpage): Improve handling of ANSI escapes.
 
->>>>>>> 1.6708
 2004-11-30  Markus Rost  <rost@ias.edu>
 
 	* textmodes/tex-mode.el (tex-main-file): Add a compatibility with
 	AUCTeX.
 
->>>>>>> 1.6704
 2004-11-30  Jay Belanger  <belanger@truman.edu>
 
 	* calc/calc-arith.el (math-possible-signs): Made stronger checks