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
1
Merge Requests
1
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
nexedi
gitlab-ce
Repository
6041fbce51f7895c1b92b131bcac7005804fdcbb
Switch branch/tag
gitlab-ce
app
assets
javascripts
merge_conflict_resolver.js.coffee
Find file
Blame
History
Permalink
Implemented conflict side selection.
· 6041fbce
Fatih Acet
authored
Jul 13, 2016
6041fbce
merge_conflict_resolver.js.coffee
3.87 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.
