X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c64a20f3dc87af145f14efa53a49ade7a9e5274b..a034c8b84911a09b68d92ebbe9a90e08f21aef23:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1e1008d6..f425d982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-26  Akim Demaille  <akim@epita.fr>
+
+	* src/conflicts.c (conflicts_print): Don't complain at all when
+	there are no reduce/reduce conflicts, and as many shift/reduce
+	conflicts as expected.
+	* tests/regression.at (%expect right): Adjust.
+
+2001-11-25  Marc Autret  <autret_m@epita.fr>
+
+	* doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.
+	From Golubev I. N.
+
 2001-11-23  Akim Demaille  <akim@epita.fr>
 
 	* lib/alloca.c: Update, from fileutils.