No matches were found for subject:"Warning about conflict markers \- undocumented 'diff \-\-check' feature \& suggestion"