diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-06 22:41:23 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-12 22:03:14 -0300 |
| commit | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (patch) | |
| tree | 7292079f50121aae6e457bfd3dadb944fb2feeec /lib/api/helpers | |
| parent | 9cc15172deaa4582c5fd956cc163539041d018b1 (diff) | |
| download | gitlab-ce-3fcab51ebb0f3156b5d732d050b292cd3e081262.tar.gz | |
Refactor conflict resolution to contain git ops within Gitlab::Git
This prepares the codebase for a Gitaly migration. See
https://gitlab.com/gitlab-org/gitaly/issues/553
Diffstat (limited to 'lib/api/helpers')
0 files changed, 0 insertions, 0 deletions