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
nexedi
gitlab-ce
Repository
88d988a2edb5c56e9cb475a1db51bf8bb399f437
Switch branch/tag
gitlab-ce
spec
features
merge_requests
conflicts_spec.rb
Find file
Blame
History
Permalink
Add more tests to check conflicts resolution
· 54bfe707
Alfredo Sumaran
authored
Oct 05, 2016
54bfe707
conflicts_spec.rb
6.36 KB
Edit
Web IDE
Replace conflicts_spec.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace conflicts_spec.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
