[3.12] pre-commit: add `check-case-conflict` and `check-merge-conflict` (GH-117259) (#117260)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
M
Miss Islington (bot) committed
0b95ba0306b4a748de38c728a1406fa0df20eea9
Parent: 36b1a20
Committed by GitHub <noreply@github.com>
on 3/26/2024, 2:12:36 PM