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>
This commit is contained in:
parent
6dac7273fb
commit
a340ded2ca
1 changed files with 1 additions and 2 deletions
|
@ -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");
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue