1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 092bfbf4c3..d70eee806c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+<<<<<<< .mine
+Tue May 27 13:12:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* io.c (Init_IO): Define ARGF.{lines,bytes,chars}.
+
 Tue May 27 12:06:37 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]