From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 26 Oct 2018 05:22:11 +0000 (+0900)
Subject: Merge branch 'np/log-graph-octopus-fix'
X-Git-Tag: v2.20.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ffa31fc36ff27edaccbb565323b95dfab2202f5;p=thirdparty%2Fgit.git

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

"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
---

0ffa31fc36ff27edaccbb565323b95dfab2202f5