Use 3-way merge for squashing commits

This upgrades Gitaly to 1.34.2 for 11-10-stable.

Use 3-way merge for squashing commits
This upgrades Gitaly to 1.34.2 for 11-10-stable.
3fdcb7d8 · Stan Hu · 62c46465 · 3fdcb7d8 · 3fdcb7d8
Commit 3fdcb7d8 authored May 03, 2019 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

GITALY_SERVER_VERSION GITALY_SERVER_VERSION +1 -1

changelogs/unreleased/sh-gitaly-update-for-11-10.yml changelogs/unreleased/sh-gitaly-update-for-11-10.yml +5 -0

No files found.
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
-1.34.1
+1.34.2
--- a/changelogs/unreleased/sh-gitaly-update-for-11-10.yml
+++ b/changelogs/unreleased/sh-gitaly-update-for-11-10.yml
+---
+title: Use 3-way merge for squashing commits
+merge_request: 28078
+author:
+type: fixed