summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorChristine Lytwynec <chris.lytwynec@gmail.com>2015-04-22 11:45:55 -0400
committerChristine Lytwynec <chris.lytwynec@gmail.com>2015-04-22 11:45:55 -0400
commit84d4702ac0066209066a399e68d271142d981359 (patch)
tree271cec3d33a9f47b991652ae367e6fe3be8842e4 /coverage/control.py
parent9e0842fe32bb0fee205c9132d55e384b29446bc9 (diff)
downloadpython-coveragepy-git-84d4702ac0066209066a399e68d271142d981359.tar.gz
Update docstring and command line help text.
--HG-- branch : combine-from-multiple-dirs
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 4a9ac727..2c8d384e 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -724,6 +724,10 @@ class Coverage(object):
coverage() constructor) will be read, and combined together into the
current measurements.
+ `data_dirs` is a list of directories from which data files should be
+ combined. If no list is passed, then the data files from the current
+ directory will be combined.
+
"""
self._init()
aliases = None