git.saurik.com Git - bison.git/commit

]> git.saurik.com Git - bison.git/commit

projects / bison.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: f87685c) | patch

author	Akim Demaille <akim@epita.fr>
	Mon, 17 Dec 2001 17:32:08 +0000 (17:32 +0000)
committer	Akim Demaille <akim@epita.fr>
	Mon, 17 Dec 2001 17:32:08 +0000 (17:32 +0000)
commit	709ae8c6ee619a2bf89a26ddd7575bdeb5d1896f
tree	5937d688b948992494ec7fb441b75020dd15e10d	tree \| snapshot
parent	f87685c3245a30154897374780d5d0471c7229c0	commit \| diff

* src/conflicts.c (flush_shift): Also adjust lookaheadset.
(flush_reduce): New.
(resolve_sr_conflict): Adjust.

ChangeLog		diff \| blob \| blame \| history
src/conflicts.c		diff \| blob \| blame \| history

bison