From 84d4702ac0066209066a399e68d271142d981359 Mon Sep 17 00:00:00 2001
From: Christine Lytwynec <chris.lytwynec@gmail.com>
Date: Wed, 22 Apr 2015 11:45:55 -0400
Subject: Update docstring and command line help text.

--HG--
branch : combine-from-multiple-dirs
---
 coverage/control.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'coverage/control.py')

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
-- 
cgit v1.2.1