Skip to content
GitLab
Explore
Sign in
Register
Admin message
This instance will be upgraded to Heptapod 1.3.1 (GitLab 16.9.3) on 2023-03-28 at 17:00 UTC+1
heptapod
heptapod
Repository
heptapod
app
controllers
projects
merge_requests_controller.rb
Find file
Blame
History
Permalink
Show appropriate message when conflicts have already been resolved
· 3ab63b2c595b
Douwe Maan
authored
Aug 10, 2016
3ab63b2c595b