}
close $fh;
if ($marker_found) {
fail("$file has no merge conflict markers");
fail("$file contains merge conflict markers in line $line");
diag("marker found in line $line");
} else {
pass("$file has no merge conflict markers");
-