Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Register
Sign in
Toggle navigation
Menu
nexedi
gitlab-ce
Repository
gitlab-ce
lib
gitlab
git
repository.rb
Find file
Blame
History
Permalink
Merge branch 'fix-conflict-highlighting' into 'master'
· 202ab628
Douwe Maan
authored
Nov 20, 2017
Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
202ab628
