1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d1b4bf38b..ac4a6f51c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec  5 11:37:37 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#macro_defined?): use clearly different
+	  strings from conflict markers.
+
 Wed Dec  5 04:25:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* lib/README: Add rdoc modeline directive and formatting libs