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

.pre-commit-config.yaml

@@ -12,6 +12,6 @@
     -   id: shellcheck
         files: *shellscripts
 -   repo: https://www.shore.co.il/git/git-pre-commit/
-    sha: v0.1.0
+    sha: v0.1.1
     hooks:
     - id: merge-conflict