merge heads

.gitignore

 # Two-trick pony for OSX and other case insensitive file systems:
 # Ignore ./python binary on Unix but still look into ./Python/ directory.
 /python
-!/Python/**
+!/Python/
 *.cover
 *.o
 *.orig
@@ -69,8 +69,8 @@ config.status
 config.status.lineno
 core
 db_home
-config.log
-config.status
+.hg/
+ipch/
 libpython*.a
 libpython*.so*
 platform
@@ -93,3 +93,5 @@ htmlcov/
 Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
+.vs/
+.vscode/

.hgignore

@@ -94,7 +94,10 @@ htmlcov/
 *.gcda
 *.gcno
 *.gcov
+ipch/
 coverage.info
 Tools/msi/obj
 Tools/ssl/amd64
 Tools/ssl/win32
+.vs/
+.vscode/