lib/gitlab/git/repository.rb · af13ffbcedd8952433d4d3f6693aac3450c5fa6f · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

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

repository.rb 49 KB