app/controllers/projects/merge_requests/diffs_controller.rb · e373e4fd78e31fec3fa2cf2cc3ebd7a94040f8de · nexedi / gitlab-ce · GitLab

You need to sign in or sign up before continuing.

Find file Blame History Permalink

Display merge conflicts message when comparing against head · 4c2156a6
Phil Hughes authored Aug 17, 2020
```
Closes https://gitlab.com/gitlab-org/gitlab/-/issues/230991
```
4c2156a6