summaryrefslogtreecommitdiff
path: root/coverage/cmdline.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-07-30 07:34:37 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-07-30 07:34:37 -0400
commite812f4dd7e82a9de6323b139c9ae3e02cd16d7f0 (patch)
treebc6cf8876d9e990142c3b16180f1974f279d57d8 /coverage/cmdline.py
parentc78f8f2df1e3d2843514b98b9fedafb454711b0c (diff)
downloadpython-coveragepy-e812f4dd7e82a9de6323b139c9ae3e02cd16d7f0.tar.gz
Clean up from the merge of PR 62
Remove the globbing option. Added a test. Corrected parameter names and docs. Updated the AUTHORS file.
Diffstat (limited to 'coverage/cmdline.py')
-rw-r--r--coverage/cmdline.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py
index 5d1b388..a6ae7c3 100644
--- a/coverage/cmdline.py
+++ b/coverage/cmdline.py
@@ -256,9 +256,9 @@ CMDS = {
description = "Combine data from multiple coverage files collected "
"with 'run -p'. The combined results are written to a single "
"file representing the union of the data. The positional "
- "arguments are files or directories or shell globs "
- "representing the data files which should be combined. "
- "By default, only data files in the current directory are combined."
+ "arguments are data files or directories containing data files. "
+ "If no paths are provided, data files in the default data file's "
+ "directory are combined."
),
'debug': CmdOptionParser("debug", GLOBAL_ARGS,