-
Phil Hughes authored
This is the frontend for https://gitlab.com/gitlab-org/gitlab/-/issues/267337 which will allow the diffs app to correctly display merge conflicts and style them accordingly.
400b0094
This is the frontend for https://gitlab.com/gitlab-org/gitlab/-/issues/267337 which will allow the diffs app to correctly display merge conflicts and style them accordingly.