[1-34-stable] Use 3-way merge for squashing commits (!1230) · Merge requests · GitLab.org / gitaly · GitLab

Stan Hu requested to merge sh-3-way-merge-1-34-branch into 1-34-stable Apr 30, 2019

For gitlab-org/release/tasks#772 (closed)

See merge request !1214 (merged)