diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-24 09:34:15 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-24 09:34:15 +0000 |
| commit | d92bd8e2a5ca13d8aac58eab72e715ce792f13fb (patch) | |
| tree | f8055511999973c1f6bb0113e234e9f04d3aa438 /qa | |
| parent | f8385188f0eb2ee526404d4529f167db7ce21a63 (diff) | |
| parent | 0b965528c6dd6db67adf5b86c62c19088ebe65f5 (diff) | |
| download | gitlab-ce-d92bd8e2a5ca13d8aac58eab72e715ce792f13fb.tar.gz | |
Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'
GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side
See merge request gitlab-org/gitlab-ce!16655
Diffstat (limited to 'qa')
0 files changed, 0 insertions, 0 deletions