Merge latest code from main coverage.py repo

1 files changed, 0 insertions, 12 deletions

diff --git a/TODO.txt b/TODO.txt
index 84723968..d7aefdd0 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,17 +1,5 @@
 Coverage TODO
 
-* Zooko's code
-
-+ How do include and omit interact?
-    Include, then omit.
-+ Test include and omit during run.
-- How do coverage.__init__(omit, include) interact with coverage.report(omit, include)?
-    - Should cmdline pass omit and include to report/annotate/html/xml?
-        They've already been given to the constructor.
-+ Can you use both omit and include together?
-    yes.
-+ Fix up docstrings.  How to deal well with the commonality among all the methods that take omit and include?
-
 * 3.3
 
 - Config file