[Koha-patches] [PATCH] 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

[Chris Nighswonger]

---
 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.2.5