Merge branch 'phikai-clarify-tiers-merge-driver' into 'master'

Clarify custom merge driver version support

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



Merged-by: Evan Read <eread@gitlab.com>
Approved-by: Evan Read <eread@gitlab.com>
Reviewed-by: Evan Read <eread@gitlab.com>
Co-authored-by: Kai Armstrong <karmstrong@gitlab.com>

doc/user/project/git_attributes.md

@@ -52,13 +52,12 @@ The `.gitattributes` file can be used to define which language to use when
 syntax highlighting files and diffs. For more information, see
 [Syntax highlighting](highlighting.md).
 
-## Custom merge drivers
+## Custom merge drivers **(FREE SELF)**
 
 > Ability to configure custom merge drivers through GitLab introduced in GitLab 15.10.
 
-You can define [custom merge drivers](https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver)
-in a GitLab configuration file, then use the custom merge drivers in a Git
-`.gitattributes` file.
+GitLab self-managed instance administrators can define [custom merge drivers](https://git-scm.com/docs/gitattributes#_defining_a_custom_merge_driver)
+in a GitLab configuration file, then use the custom merge drivers in a Git `.gitattributes` file. Custom merge drivers are not supported on GitLab.com.
 
 You might configure a custom merge driver, for example, if there are certain
 files that should be ignored during a merge such as build files and configuration files.