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
197ac5ebbfd8ca7fbcb79776fd25ca0e213376c4
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflicts
components
diff_file_editor.js.es6
Find file
Blame
History
Permalink
Ability to resolve conflicts for files with `text-editor` as conflict type
· 197ac5eb
Alfredo Sumaran
authored
Sep 29, 2016
197ac5eb
diff_file_editor.js.es6
2.11 KB
Edit
Web IDE
Replace diff_file_editor.js.es6
×
Attach a file by drag & drop or
click to upload
Commit message
Replace diff_file_editor.js.es6
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
