2020-10-16 12:09:33 +00:00
|
|
|
---
|
|
|
|
name: display_merge_conflicts_in_diff
|
|
|
|
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
|
2020-11-09 15:08:56 +00:00
|
|
|
rollout_issue_url:
|
|
|
|
milestone: '13.5'
|
2020-10-16 12:09:33 +00:00
|
|
|
type: development
|
|
|
|
group: group::source code
|
|
|
|
default_enabled: false
|