Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
GitLab.org
GitLab FOSS
Repository
gitlab-foss
lib
gitlab
git
conflict
resolver.rb
Find file
Blame
History
Permalink
Create a Gitlab::Git submodule for conlict-related files
· faa9bd40
Alejandro Rodríguez
authored
Oct 09, 2017
Rename classes to (hopefully) clearer names while we're doing that.
faa9bd40