From e0a14d7f4139d0c53f770740b732150f6ad19090 Mon Sep 17 00:00:00 2001
From: Milos Blasko <blaskomm@gmail.com>
Date: Thu, 10 Mar 2016 15:32:12 +0100
Subject: [PATCH] Ensure blank lines aren't reported as uncovered, related
 issue https://github.com/colszowka/simplecov/issues/444

---
 lib/simplecov/merge_helpers.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/simplecov/merge_helpers.rb b/lib/simplecov/merge_helpers.rb
index bd1f6e8d..a2ec6bdd 100644
--- a/lib/simplecov/merge_helpers.rb
+++ b/lib/simplecov/merge_helpers.rb
@@ -4,7 +4,7 @@ module ArrayMergeHelper
     def merge_resultset(array)
       new_array = dup
       array.each_with_index do |element, i|
-        if element.nil? && new_array[i].nil?
+        if element.nil? || new_array[i].nil?
           new_array[i] = nil
         else
           local_value = element || 0