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
Léo-Paul Géneau
gitlab-ce
Repository
ff15fbf10c8c32fde876e5c9578fdc2161b7905c
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_resolver.js.coffee
Find file
Blame
History
Permalink
Implement conflict selection with highlighting.
· ff15fbf1
Fatih Acet
authored
Jul 14, 2016
ff15fbf1
merge_conflict_resolver.js.coffee
5.28 KB
Edit
Web IDE
Replace merge_conflict_resolver.js.coffee
×
Attach a file by drag & drop or
click to upload
Commit message
Replace merge_conflict_resolver.js.coffee
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
