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

Use asottile/add-trailing-comma

Browse source
This commit is contained in:
Anthony Sottile 2017-07-12 18:35:24 -07:00
parent 286962eeb7
commit 2a902e0a07
19 changed files with 48 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pre_commit_hooks/check_merge_conflict.py
View file

@ -7,7 +7,7 @@ CONFLICT_PATTERNS = [
b'<<<<<<< ',
b'======= ',
b'=======\n',
b'>>>>>>> '
b'>>>>>>> ',
]
WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'