Merge .cvsignore files into .gitignore