lib/gitlab/git/conflict/resolver.rb · d08b1ed8a3d4e47e69ef4949ee1b8bbc933bc009 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Create a Gitlab::Git submodule for conlict-related files · 076e56d7
Alejandro Rodríguez authored Oct 09, 2017
```
Rename classes to (hopefully) clearer names while we're doing that.
```
076e56d7