@@ -, +, @@ --- t/00-merge-conflict-markers.t | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) --- a/t/00-merge-conflict-markers.t +++ a/t/00-merge-conflict-markers.t @@ -49,8 +49,7 @@ find({ } close $fh; if ($marker_found) { - fail("$file has no merge conflict markers"); - diag("marker found in line $line"); + fail("$file contains merge conflict markers in line $line"); } else { pass("$file has no merge conflict markers"); } --