-
Phil Hughes authored
This adds an alert component to each diff file that has conflicts. https://gitlab.com/gitlab-org/gitlab/-/issues/281171
30a6f52a
This adds an alert component to each diff file that has conflicts. https://gitlab.com/gitlab-org/gitlab/-/issues/281171