Merge branch 'master' into report-refactoring

sebastianbergmann · sebastianbergmann · commit 69db95062e11 · 2011-01-16T13:04:42.000+01:00
diff --git a/PHP/CodeCoverage.php b/PHP/CodeCoverage.php
@@ -371,6 +371,8 @@ public function merge(PHP_CodeCoverage $that)
                 }
             }
         }
+
+        $this->tests = array_merge($this->tests, $that->getTests());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,8 @@ public function merge(PHP_CodeCoverage $that)`
`371`	`371`	`}`
`372`	`372`	`}`
`373`	`373`	`}`
	`374`	`+`
	`375`	`+ $this->tests = array_merge($this->tests, $that->getTests());`
`374`	`376`	`}`
`375`	`377`
`376`	`378`	`/**`