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
66ff67b063f2c8d06f40625595c4208c33ffd1f1
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
merge_conflict_store.js.es6
Find file
Blame
History
Permalink
Add more tests to check conflicts resolution
· 54bfe707
Alfredo Sumaran
authored
Oct 05, 2016
54bfe707
merge_conflict_store.js.es6
12 KB
Edit
Web IDE
Replace merge_conflict_store.js.es6
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflict_store.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
