Check for diff3-style merge conflict artifacts.#586

christhekeele wants to merge 2 commits intopre-commit:mainpre-commit/pre-commit-hooks:mainfrom

christhekeele:check-diff3-conflict-artifactschristhekeele/official-pre-commit-hooks:check-diff3-conflict-artifactsCopy head branch name to clipboard