Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Tatuya Kamada
gitlab-ce
Repository
254dbad8f7c2213f87087858ff31a62f0d41a189
Switch branch/tag
gitlab-ce
lib
gitlab
conflict
file.rb
Find file
Blame
History
Permalink
Fix bug where conflict view would have one too many context sections
· 254dbad8
Douwe Maan
authored
Aug 10, 2016
254dbad8
file.rb
6.36 KB
Edit
Web IDE
Replace file.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace file.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.