Exclude NOTICE files from merge conflict detection. (#8498)

cmacknz · web-flow · commit d3bc5d967fef · 2025-06-16T10:34:27.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -8,3 +8,4 @@ repos:
         exclude: (.*/.*.(tmpl|tftpl)$)
     -   id: check-merge-conflict
         args: ['--assume-in-merge']
+        exclude: (^NOTICE.*\.txt$)
