[PD-dev] preventing merging of .pd files

[Hans-Christoph Steiner]

I just committed some changes to CVSROOT/cvswrappers to make cvs copy  
instead of merge when there is a conflict with a .pd file.  cvs can't  
meaningfully merge .pd files, so its best to turn off merging.

Let me know if anyone has any problems.  Here's some reading on the  
topic:

http://www.idevelopment.info/data/Programming/change_management/ 
unix_cvs/PROGRAMMING_Working_with_Binary_Files.shtml

.hc

________________________________________________________________________ 
____

Using ReBirth is like trying to play an 808 with a long stick.
                                               -David Zicarelli