pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-04 19:26:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add check-merge-conflict hook

Browse source
This commit is contained in:
Guy Kisel 2015-03-13 16:30:14 -07:00
parent 70a319aea3
commit 779a42919a
5 changed files with 66 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
setup.py
View file

@ -41,6 +41,7 @@ setup(
'check-added-large-files = pre_commit_hooks.check_added_large_files:main',
'check-case-conflict = pre_commit_hooks.check_case_conflict:main',
'check-docstring-first = pre_commit_hooks.check_docstring_first:main',
'check-merge-conflict = pre_commit_hooks.check_merge_conflict:detect_merge_conflict',
'check-json = pre_commit_hooks.check_json:check_json',
'check-xml = pre_commit_hooks.check_xml:check_xml',
'check-yaml = pre_commit_hooks.check_yaml:check_yaml',