Skip to content

G
gitlab-ce
Commit b4f4fae9 authored by Amy Qualls's avatar Amy Qualls Committed by Patrick Bajao
Browse files
Options

Update feature title to start with a verb

parent 8ada9a71
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
doc/user/project/merge_requests/changes.md
View file @ b4f4fae9
...@@ -135,7 +135,7 @@ To disable it: ...@@ -135,7 +135,7 @@ To disable it:
Feature.disable(:local_file_reviews) Feature.disable(:local_file_reviews)
``` ```
## Merge request conflicts in diff ## Show merge request conflicts in diff
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5.
> - [Deployed behind a feature flag](../../feature_flags.md), disabled by default. > - [Deployed behind a feature flag](../../feature_flags.md), disabled by default.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7