[issue12255] A few changes to .*ignore

[Roundup Robot]

Roundup Robot <devnull at psf.upfronthosting.co.za> added the comment:

New changeset 9356d2d61e9f by Éric Araujo in branch '2.7':
Make VCSes ignore the compiled shared library file (#12255)
http://hg.python.org/cpython/rev/9356d2d61e9f

New changeset 4e5127874adf by Éric Araujo in branch '2.7':
Stop ignoring Mercurial merge conflits files (#12255).
http://hg.python.org/cpython/rev/4e5127874adf

----------

_______________________________________
Python tracker <report at bugs.python.org>
<http://bugs.python.org/issue12255>
_______________________________________