From 9c42417ce16cc01a09832780d54014ae0737b6d3 Mon Sep 17 00:00:00 2001 From: Chris Nighswonger Date: Wed, 26 Oct 2011 11:14:05 -0400 Subject: [PATCH] Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness Signed-off-by: Chris Cormack --- t/00-merge-conflict-markers.t | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t index 24743ae..da11a58 100644 --- a/t/00-merge-conflict-markers.t +++ b/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"); } -- 1.7.5.4