Merge branch 'hmaraszek-master-patch-55661' into 'master'

Improve misleading passage about custom merge drivers

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147932



Merged-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Approved-by: Marcin Sedlak-Jakubowski <msedlakjakubowski@gitlab.com>
Co-authored-by: Hubert Maraszek <hmaraszek@gitlab.com>