From cf39c6221e916d3a4a7d49f230dd9a7bf6c1767b Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sat, 3 Oct 2015 16:59:46 -0400
Subject: Combine can now ignore errors.

---
 coverage/config.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'coverage/config.py')

diff --git a/coverage/config.py b/coverage/config.py
index 458d490..8aff41d 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -162,6 +162,9 @@ class CoverageConfig(object):
         self.source = None
         self.timid = False
 
+        # Defaults for [combine]
+        self.ignore_combine_errors = False
+
         # Defaults for [report]
         self.exclude_list = DEFAULT_EXCLUDE[:]
         self.fail_under = 0
@@ -277,6 +280,9 @@ class CoverageConfig(object):
         ('source', 'run:source', 'list'),
         ('timid', 'run:timid', 'boolean'),
 
+        # [combine]
+        ('ignore_combine_errors', 'combine:ignore_errors', 'boolean'),
+
         # [report]
         ('exclude_list', 'report:exclude_lines', 'regexlist'),
         ('fail_under', 'report:fail_under', 'int'),
-- 
cgit v1.2.1