- Use a working version of the merge-conflict pre-commit hook locally.

e255f173 · nimrod · 7cd7e153 · e255f173
Commit e255f173 authored 7 years ago by nimrod
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,6 +12,6 @@
    -   id: shellcheck
        files: *shellscripts
 -   repo: https://www.shore.co.il/git/git-pre-commit/
-    sha: master
+    sha: v0.1.0
    hooks:
    - id: merge-conflict