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>
(cherry picked from commit a340ded2ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
This commit is contained in:
Chris Nighswonger 2011-10-26 11:14:05 -04:00
parent f74ed5ad8a
commit b253e07fca
1 changed files with 1 additions and 2 deletions

View File

@ -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");
}