Skip to content
GitLab
Explore
Sign in
Register
nexedi
gitlab-ce
Repository
gitlab-ce
lib
gitlab
git
repository.rb
Find file
Blame
History
Permalink
Merge branch 'conflict-resolution-refactor' into 'master'
· b2553840
Sean McGivern
authored
Oct 16, 2017
Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
b2553840
