Updated .cvsignore to ignore files generated due to auto-merging by CVS.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@1317 <a class="text" href="/?p=mantisbt.git;a=object;h=f5dc347c">f5dc347c</a>-c33d-0410-90a0-b07cc1902cb9