diff options
Diffstat (limited to 'config/feature_flags/development/display_merge_conflicts_in_diff.yml')
-rw-r--r-- | config/feature_flags/development/display_merge_conflicts_in_diff.yml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml new file mode 100644 index 00000000000..678037fa366 --- /dev/null +++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml @@ -0,0 +1,7 @@ +--- +name: display_merge_conflicts_in_diff +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008 +rollout_issue_url: +type: development +group: group::source code +default_enabled: false |