3 commits

Author	SHA1	Message	Date
Paul Poulain	13f29dd7f3	Test suite: ignoring backups from vi (files ending with a ~) ... On my laptop, this test was failing because some scripts had a conflict marker in a backup ... of a conflict I just fixed! ignoring any file ending with a ~	2011-12-07 15:17:54 +01:00
Chris Nighswonger	a340ded2ca	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>	2011-11-18 22:51:28 +01:00
Galen Charlton	4cef5ec961	bug 5400: new test case to find files with merge conflict markers ... Signed-off-by: Galen Charlton <gmcharlt@gmail.com> Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>	2010-11-14 09:37:27 +13:00