Package: cvs Version: 1:1.12.13-8 I'm not sure exactly what the problem is, but it appears that the date format in Date and Id keyword expansions changed from YYYY/MM/DD to YYYY-MM-DD. This, in turn, caused these lines to be treated as modified and eventually led to conflicts (though I'm not sure exactly how). Changing the date format to YYYY-MM-DD seems to fix the problem for most files.
-- Matt -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
