projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Bug 4330: Wrong address for Free Software Foundation
[koha_fer]
/
t
/
00-merge-conflict-markers.t
diff --git
a/t/00-merge-conflict-markers.t
b/t/00-merge-conflict-markers.t
index
24743ae
..
da11a58
100644
(file)
--- 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");
}