diff options
| author | Pavlo Strokov <pstrokov@gitlab.com> | 2020-10-15 12:58:13 +0300 |
|---|---|---|
| committer | Pavlo Strokov <pstrokov@gitlab.com> | 2020-10-15 12:58:13 +0300 |
| commit | 42c4f256a282ed30300c546bbb3483a800474c8b (patch) | |
| tree | 62226ccc6795e950f652c9575fa5515cc6ebb4c0 /internal/testhelper/testserver.go | |
| parent | 20fcc5232cc0ec8ef3c46af6cfcc3a698b9b7d8d (diff) | |
| parent | a67612102ed6bb365f1de6572ecf2744e498bc73 (diff) | |
Merge branch 'id-allow-conflicts-on-merge' into 'master'
Add option to include conflict markers to merge commit
See merge request gitlab-org/gitaly!2626
Diffstat (limited to 'internal/testhelper/testserver.go')
0 files changed, 0 insertions, 0 deletions