.pre-commit-config.toml: copy check-merge-conflict and commented args from mikaela.github.io

.pre-commit-config.yaml

@@ -1,5 +1,3 @@
-# @format
-
 # See https://pre-commit.com for more information
 # See https://pre-commit.ci for more information
 ci:
@@ -35,6 +33,7 @@ repos:
       - id: destroyed-symlinks
       - id: detect-private-key
       - id: fix-byte-order-marker
+      - id: check-merge-conflict
       - id: mixed-line-ending
         args: [--fix=auto]
       - id: pretty-format-json
@@ -62,6 +61,12 @@ repos:
       - id: doctoc
         # https://github.com/Mikaela/gist/blob/master/doctoc.txt
         args: [--update-only, --notitle]
+        #args:  [
+        #    --update-only,
+        #    --title,
+        #    '<em lang="fi">Automaattinen sisällysluettelo</em> / <em
+        #    lang="en">Automatically generated Table of Contents</em>',
+        #  ]
 
   # GitHub Actions etc. configuration validity checking
   - repo: https://github.com/python-jsonschema/check-jsonschema