diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-12 15:05:36 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-02-12 15:05:36 +0300 |
| commit | 75c835cb03c95a470becd8bd28cb0013249d407a (patch) | |
| tree | 23e400f529ad854739c2ea512bad37b6b7abc50c /cmd/gitaly-wrapper | |
| parent | d5de6a1b267caaac9f4b99fb3c5d3606728ad61a (diff) | |
| parent | 74bf77bd057c09e6de971cbbb60205e0e76bfe31 (diff) | |
Merge branch 'po-fix-resolveconflicts-newfile' into 'master'
Fix resolve conflicts for new files
See merge request gitlab-org/gitaly!3027
Diffstat (limited to 'cmd/gitaly-wrapper')
0 files changed, 0 insertions, 0 deletions