[Bug 17061] New: cvs conflicts on many files

http://bugs.winehq.org/show_bug.cgi?id=17061

Summary: cvs conflicts on many files
           Product: Wine
           Version: unspecified
          Platform: All
        OS/Version: Linux
            Status: UNCONFIRMED
          Severity: enhancement
          Priority: P5
         Component: -unknown
        AssignedTo: [e-mail]
        ReportedBy: [e-mail]
                CC: [e-mail]

Created an attachment (id=18871)
 --> (http://bugs.winehq.org/attachment.cgi?id=18871)
result of the command cvs update -PAd

Hello,
cvs update has conflicts.
I attach the result of the command

cvs update -PAd > result.txt

Luca.