Hasso Tepper wrote: > C src/contrib/gcc-4.1/gcc/c-opts.c [snip]
> 1 conflicts created by this import. > Use the following command to help the merge: > > cvs checkout -jFSF:yesterday -jFSF src/contrib/gcc-4.1 Hmmm. What happened is that I believed the text in README that this directory must contain only upstream sources, but this file contained local change and this change went into vendor branch now. Is there anything I must do now with it? AFAICS the file itself is correct in checkout etc. -- Hasso Tepper
