bug 5400: new test case to find files with merge conflict markers