From: Chris Nighswonger <chris.nighswonger@gmail.com>
Date: Wed, 26 Oct 2011 15:14:05 +0000 (-0400)
Subject: Bug 7095: Fixing cut and paste error and removing the use of diag() as this does... 
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=a340ded2ca5b95b1ae4f14423cab3fda107ed597;p=koha.git

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 <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---

diff --git a/t/00-merge-conflict-markers.t b/t/00-merge-conflict-markers.t
index 24743aee11..da11a58502 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");
         }