%expect 0 in parse-gram.y

[Joel E. Denny]

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1545
diff -p -u -r1.1545 ChangeLog
--- ChangeLog   11 Aug 2006 20:52:55 -0000      1.1545
+++ ChangeLog   13 Aug 2006 03:12:53 -0000
@@ -1,3 +1,7 @@
+2006-08-12  Joel E. Denny  <address@hidden>
+
+       * src/parse-gram.y: Add `%expect 0' so we don't overlook conflicts.
+
 2006-08-11  Paul Eggert  <address@hidden>
 
        * bootstrap: Put in need-ngettext argument to AM_GNU_GETTEXT,
Index: src/parse-gram.y
===================================================================
RCS file: /sources/bison/bison/src/parse-gram.y,v
retrieving revision 1.88
diff -p -u -r1.88 parse-gram.y
--- src/parse-gram.y    29 Jul 2006 05:53:41 -0000      1.88
+++ src/parse-gram.y    13 Aug 2006 03:12:54 -0000
@@ -83,6 +83,7 @@ static int current_prec = 0;
 %error-verbose
 %defines
 %name-prefix="gram_"
+%expect 0
 
 %initial-action
 {