Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Repository
26f658decd3943bbc66c567ea91e7b859b32e0e6
Switch branch/tag
gitlab-ce
app
views
projects
merge_requests
conflicts
_diff_file_editor.html.haml
Find file
Blame
History
Permalink
Implement editor to manually resolve merge conflicts
· 26f658de
Alfredo Sumaran
authored
Sep 08, 2016
26f658de
_diff_file_editor.html.haml
481 Bytes
Edit
Web IDE
Replace _diff_file_editor.html.haml
×
Attach a file by drag & drop or
click to upload
Commit message
Replace _diff_file_editor.html.haml
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
