Mercurial > emacs

diff src/ChangeLog @ 103941:993dd6f7d1a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix last change.
author Chong Yidong <cyd@stupidchicken.com>
date Fri, 17 Jul 2009 01:32:50 +0000
parents 2f59f01ae070
children 32ed90139411
line wrap: on
line diff
--- a/src/ChangeLog	Fri Jul 17 01:28:58 2009 +0000
+++ b/src/ChangeLog	Fri Jul 17 01:32:50 2009 +0000
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2009-07-17  Kenichi Handa  <handa@m17n.org>
 
 	* casetab.c (shuffle): Fix the logic of setting up the cycle.