---
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
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/
