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
829a708a970b31afdcda21fff072eda0c61dfd4c
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_data_provider.js.es6
Find file
Blame
History
Permalink
fix diff_view cookie path within merge conflict page
· 62ba000e
Mike Greiling
authored
Sep 20, 2016
62ba000e
merge_conflict_data_provider.js.es6
8.91 KB
Edit
Web IDE
Replace merge_conflict_data_provider.js.es6
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace merge_conflict_data_provider.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
