lib/gitlab/git/conflict/resolver.rb · 196df264467c2332fbeed1ff350ef176e92d0fd6 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

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

resolver.rb 3.24 KB