I'm updating the source and getting the following messages in the documentation
tree:
U abi/user/wp/help/es-ES/why.html
cvs server: Updating abi/user/wp/help/fr-FR
RCS file: /cvsroot/abi/user/wp/help/fr-FR/about.html,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into about.html
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in abi/user/wp/help/fr-FR/about.html
C abi/user/wp/help/fr-FR/about.html
RCS file: /cvsroot/abi/user/wp/help/fr-FR/basis1.html,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into basis1.html
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in abi/user/wp/help/fr-FR/basis1.html
C abi/user/wp/help/fr-FR/basis1.html
RCS file: /cvsroot/abi/user/wp/help/fr-FR/basis2.html,v
retrieving revision 1.1
retrieving revision 1.3
Merging differences between 1.1 and 1.3 into basis2.html
rcsmerge: warning: conflicts during merge
What's going on?
