From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Aug 2019 21:26:09 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-octopus-fix'
X-Git-Tag: v2.23.0-rc2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3bcedae27ea2af2e3895d92d6525231e350c91be?hp=a35bea40b674b21fbdb98d982e41c46d014ced83

Merge branch 'ds/commit-graph-octopus-fix'

commit-graph did not handle commits with more than two parents
correctly, which has been corrected.

* ds/commit-graph-octopus-fix:
commit-graph: fix bug around octopus merges
---