Some fixups for pre-commit checks.

.pre-commit-config.yaml

@@ -27,7 +27,7 @@ repos:
         exclude: LICENSE
 
   - repo: https://github.com/executablebooks/mdformat.git
-    rev: 0.5.3
+    rev: 0.7.9
     hooks:
       - id: mdformat
 
@@ -45,6 +45,7 @@ repos:
     rev: v0.6.0
     hooks:
       - id: shell-lint
+        exclude: \.bats$
 
   - repo: https://github.com/shellcheck-py/shellcheck-py.git
     rev: v0.7.1.1

tests/merge-conflict.bats

@@ -5,6 +5,7 @@ setup () {
     if [ ! -f "$repo/file" ]
     then
         git init "$repo"
+        # shellcheck disable=SC2164
         cd "$repo"
         git config user.name "Your Name"
         git config user.email "name@example.com"