diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-29 18:09:53 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-29 18:09:53 +0000 |
| commit | 2dcdb22ddf7f36f4f9581737bc4e639655e9f178 (patch) | |
| tree | eb90d2340f7da8c9803d51025bb1ee8498887c37 /doc/user | |
| parent | dbdfb3e36dd5ed7b66a029cdd3202d6d7da5ae55 (diff) | |
| download | gitlab-ce-2dcdb22ddf7f36f4f9581737bc4e639655e9f178.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/changes.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index f6e02dc0dfe..07ee2ef90c4 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -140,6 +140,7 @@ Files marked as viewed are not shown to you again unless either: > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5 [with a flag](../../../administration/feature_flags.md) named `display_merge_conflicts_in_diff`. Disabled by default. > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/276918) in GitLab 15.7. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/276918) in GitLab 15.8. Feature flag `display_merge_conflicts_in_diff` removed. To avoid displaying the changes that are already on target branch in the diff, we compare the merge request's source branch with HEAD of the target branch. |