ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

I’m leaving the .gitignore file alone, as I don’t know how git users
work with merges and conflicts.
This commit is contained in:
Éric Araujo 2011-07-28 22:45:46 +02:00
parent 5c8545bb2c
commit 2f834f2061
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

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