pre-commit: add hook check-merge-conflict#7883

DaanHoogland merged 1 commit into

apache:mainapache/cloudstack:mainfrom

jbampton:pre-commit-merge-conflictjbampton/cloudstack:pre-commit-merge-conflictCopy head branch name to clipboard