From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 25 Mar 1994 22:52:41 +0000 (+0000)
Subject: entered into RCS
X-Git-Tag: GNU_ORIG~73
X-Git-Url: https://git.saurik.com/bison.git/commitdiff_plain/fe01694d7ccf76b2cacbf2d9da30bed07976404d?ds=inline

entered into RCS
---

diff --git a/src/main.c b/src/main.c
index dc53fd81..ac11f93f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -71,8 +71,7 @@ char *argv[];
 
   /* Find and record any conflicts: places where one token of lookahead is not
      enough to disambiguate the parsing.  In file conflicts.
-     Currently this does not do anything to resolve them;
-     the trivial form of conflict resolution that exists is done in output.  */
+     Also resolve s/r conflicts based on precedence declarations.  */
   initialize_conflicts();
 
   /* print information about results, if requested.  In file print. */