Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
nexedi
gitlab-ce
Repository
827d3914
Switch branch/tag
gitlab-ce
app
models
merge_request_diff.rb
Find file
Blame
History
Permalink
Correctly determine MR diff base when MR has merge conflicts
· 5cce1278
Douwe Maan
authored
Jan 27, 2016
5cce1278
Replace merge_request_diff.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_request_diff.rb
Replace file
Cancel
GitLab will create a branch in your fork and start a merge request.