problems with cvs -z9 update

[Markus Kossmann]

When trying to update my egcs CVS tree I´am getting the following
errors message :
P gcc/c-common.c
P gcc/c-decl.c
P gcc/c-lex.c
M gcc/c-parse.c
P gcc/config.sub
RCS file: /egcs/carton/cvsfiles/egcs/g,v
retrieving revision 1.131
retrieving revision 1.135
Merging differences between 1.131 and 1.135 into configure
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in gcc/configure
C gcc/configure
P gcc/configure.in
P gcc/cplus-dem.c
and  gcc/configure is broken .  
-- 
------------------------------------------------------------------------------
Markus			           <markus.kossmann@inka.de> (Markus Kossmann)