X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b8a4155924804190fb5b08eecf5cf2c2529e5a1d..3b452f4ea6f6e69ba90d93cf1bed2ef1437f5b29:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index fb629773..c89138a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-09  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+	Change %merge result type clash warnings to errors.  Discussed at
+	<http://lists.gnu.org/archive/html/bison-patches/2006-07/msg00026.html>.
+	* src/reader.c (record_merge_function_type): Use complain_at.
+	* tests/glr-regression.at (Missed %merge type warnings when LHS type is
+	declared later): Update test case results.
+
 2006-07-09  Akim Demaille  <akim@lrde.epita.fr>
 
 	* src/getargs.h, src/getargs.c: Swap --report and --trace handling