From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:49 +0000 (+0900)
Subject: Merge branch 'np/log-graph-octopus-fix' into maint
X-Git-Tag: v2.19.2~47
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a51c63809e67a40767313df3bb1ca3e88053ff1f

Merge branch 'np/log-graph-octopus-fix' into maint

"git log --graph" showing an octopus merge sometimes miscounted the
number of display columns it is consuming to show the merge and its
parent commits, which has been corrected.

* np/log-graph-octopus-fix:
log: fix coloring of certain octopus merge shapes
---

a51c63809e67a40767313df3bb1ca3e88053ff1f