lib/gitlab/git/conflict/parser.rb · 9291048fc0b4afe228ccf3b59b8260f6ddd09005 · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Oct 09, 2017
faa9bd40
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
Create a Gitlab::Git submodule for conlict-related files
Alejandro Rodríguez authored Oct 09, 2017
```
Rename classes to (hopefully) clearer names while we're doing that.
```