I'm seeing a lot of collisions when doing cvs update on a system with a cvs-compatible patch. On a system that fails patching, and instead updates the file entirely, no collisions. I'm not making any changes to the files locally.
Has anyone else seen this? Nearly all of the *.info files in the latest update to 5.2b5 had collision indicators in them as the info file above.
Before I rip my cvs install apart, I just wondered if anyone else saw this behavior.
Thanks!
