summaryrefslogtreecommitdiff
path: root/config/feature_flags/development/display_merge_conflicts_in_diff.yml
blob: d460e491480a675a6778cf0467006139695ef1af (plain)
1
2
3
4
5
6
7
8
---
name: display_merge_conflicts_in_diff
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097
milestone: '13.5'
type: development
group: group::source code
default_enabled: false