[3.11] pre-commit: add `check-case-conflict` and `check-merge-conflict` (GH-117259) (#117261)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
M
Miss Islington (bot) committed
452b0e5142cd27fc76ff3f073d937cdeaf878a3c
Parent: 2d93236
Committed by GitHub <noreply@github.com>
on 3/26/2024, 2:11:30 PM