mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-23 09:19:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Stop ignoring Mercurial merge conflits files (#12255).

Browse source 
R. David Murray and I think that it’s more useful to have these files
show up in the output of “hg status”, to let the user know that some
merged file have to be checked before commit.  If you want to ignore
these files in your clones, it’s possible to do so from another ignore
file; see the bug report for directions.
This commit is contained in:
Éric Araujo 2011-07-29 12:07:31 +02:00
parent 2636d77c47
commit 3037bb7340
1 changed files with 0 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.hgignore
View file

@ -45,8 +45,6 @@ libpython*.so*
*.pyo
*.pyd
*.cover
*.orig
*.rej
*~
Lib/lib2to3/*.pickle
Lib/test/data/*