This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
cvs server: conflicts found in gcc/c-parse.c
- To: egcs-bugs at cygnus dot com
- Subject: cvs server: conflicts found in gcc/c-parse.c
- From: Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>
- Date: Thu, 26 Feb 1998 14:55:11 +0100 (MET)
- Reply-To: Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>
% cvs -q update -P
RCS file: /egcs/carton/cvsfiles/egcs/gcc/c-parse.c,v
retrieving revision 1.2
retrieving revision 1.3
Merging differences between 1.2 and 1.3 into c-parse.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in gcc/c-parse.c
C gcc/c-parse.c
Perhaps someone might want to have a look what's going on there?
Gerald
--
Gerald Pfeifer (Jerry) Vienna University of Technology
pfeifer@dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/