Skip to content

Commit 2235d62

Browse files
author
Steve Peak
authored
Merge pull request codecov#112 from 13steinj/patch-1
Replace `coverage merge` with `coverage combine`
2 parents 12ad36d + 6354ac2 commit 2235d62

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

codecov/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ def main(*argv, **kwargs):
673673
if os.path.exists(opj(os.getcwd(), '.coverage')) and not os.path.exists(opj(os.getcwd(), 'coverage.xml')):
674674
if glob.glob(opj(os.getcwd(), '.coverage.*')):
675675
write(' Mergeing coverage reports')
676-
try_to_run('coverage merge')
676+
try_to_run('coverage combine')
677677

678678
write(' Generating coverage xml reports for Python')
679679
# using `-i` to ignore "No source for code" error

0 commit comments

Comments
 (0)