Bump pre-commit hooks and add a few

[ci skip]
SamWhited · Jun 11, 2015 · 244139b · 244139b
1 parent 1f81b62
commit 244139b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,15 @@
 -   repo: git://github.com/pre-commit/pre-commit-hooks
-    sha: v0.4.1
+    sha: v0.4.2
     hooks:
       -   id: autopep8-wrapper
           args: ['-i']
           exclude: 'docs/source/_themes/'
       -   id: check-json
       -   id: check-yaml
+      -   id: name-tests-test
       -   id: debug-statements
       -   id: end-of-file-fixer
       -   id: trailing-whitespace
+      -   id: check-case-conflict
+      -   id: check-merge-conflict
       -   id: check-docstring-first