cvs server: conflicts found in gcc/c-parse.c

[Jason Merrill]

BTW, how would people feel about removing some of the generated files from
CVS?  I think it's reasonable to expect people using the CVS repository to
have bison installed.

Jason