Mercurial > emacs

diff src/ChangeLog @ 61192:a4c4fe785cf5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Kenichi Handa <handa@m17n.org>
date Fri, 01 Apr 2005 01:30:38 +0000
parents 9a92248c5bb2
children 1e515cc6ca0c
line wrap: on
line diff
--- a/src/ChangeLog	Fri Apr 01 01:13:14 2005 +0000
+++ b/src/ChangeLog	Fri Apr 01 01:30:38 2005 +0000
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2005-04-01  Kenichi Handa  <handa@m17n.org>
 
 	* lisp.h (Vascii_upcase_table, Vascii_canon_table,