Added --assume-in-merge option for check-merge-conflict#301

asottile merged 1 commit intopre-commit:masterpre-commit/pre-commit-hooks:masterfrom

vinayinvicible:force-mergeCopy head branch name to clipboard