Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/python/cpython
09 December 2020, 11:06:31 UTC
Revision 2f834f20615d5b69b8476aea533de549808d993f authored by Éric Araujo on 28 July 2011, 20:45:46 UTC, committed by Éric Araujo on 28 July 2011, 20:45:46 UTC 
Stop ignoring Mercurial merge conflits files (#12255).
 
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.
1 parent 5c8545b
Raw File
Tip revision: 2f834f20615d5b69b8476aea533de549808d993f authored by Éric Araujo on 28 July 2011, 20:45:46 UTC
Stop ignoring Mercurial merge conflits files (#12255).
Tip revision: 2f834f2
.gitignore 
*.cover
*.o
*.orig
*.pyc
*.pyd
*.pyo
*.rej
*~
Doc/build/
Doc/tools/docutils/
Doc/tools/jinja2/
Doc/tools/pygments/
Doc/tools/sphinx/
Lib/lib2to3/*.pickle
Makefile
Makefile.pre
Misc/python.pc
Modules/Setup
Modules/Setup.config
Modules/Setup.local
Modules/config.c
Modules/ld_so_aix
PCbuild/*.bsc
PCbuild/*.dll
PCbuild/*.exe
PCbuild/*.exp
PCbuild/*.lib
PCbuild/*.ncb
PCbuild/*.o
PCbuild/*.pdb
PCbuild/Win32-temp-*
Parser/pgen
Parser/pgen.stamp
__pycache__
autom4te.cache
build/
config.log
config.status
libpython*.a
libpython*.so*
pybuilddir.txt
pyconfig.h
python
python-gdb.py
tags
.coverage
coverage/
htmlcov/
back to top