Bug 7095: Fixing cut and paste error and removing the use of diag() as this does...
authorChris Nighswonger <chris.nighswonger@gmail.com>
Wed, 26 Oct 2011 15:14:05 +0000 (11:14 -0400)
committerPaul Poulain <paul.poulain@biblibre.com>
Fri, 18 Nov 2011 21:51:28 +0000 (22:51 +0100)
commita340ded2ca5b95b1ae4f14423cab3fda107ed597
treec8bf5368b45c092d9b44b8978c01ddf5d969dbd1
parent6dac7273fbc2eff7805d2a9bda1eb9a275962c00
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>
t/00-merge-conflict-markers.t