Fix bug in computation of coverage percentage: Only count a line if it
was executed or if we print the >>>>>> marker.