Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Privacy
Imprint
Contact
Sign in
Toggle navigation
Menu
projects.thm.de
GitLab FOSS
Repository
gitlab
app
assets
stylesheets
pages
merge_conflicts.scss
Find file
Blame
History
Permalink
Implement conflict selection with highlighting.
· ff15fbf1
Fatih Acet
authored
Jul 14, 2016
ff15fbf1