[3.11] pre-commit: add check-case-conflict
and check-merge-conflict
(GH-117259)#117261
Merged
AlexWaygood merged 1 commit intopython:3.11from Mar 26, 2024
8000
check-case-conflict
and check-merge-conflict
(GH-117259)#117261