1 commit

Author	SHA1	Message	Date
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