pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-06 12:06:53 +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

7
hooks.yaml
View file

@ -31,6 +31,13 @@
entry: check-json
language: python
files: \.json$
- id: check-merge-conflict
name: Check for merge conflicts
description: Check for files that contain merge conflict strings.
entry: check-merge-conflict
language: python
# Match all files
files: ''
- id: check-xml
name: Check Xml
description: This hook checks xml files for parseable syntax.