tree 80db21ebef287c8de160958272c749cdcfa384a7
parent 3f0c460b45b003d3433d3e6f9f471025bb04f63b
parent 04005834ed07e0b3a63793f386570c8bcf73f9a3
author Junio C Hamano <gitster@pobox.com> 1542808669 +0900
committer Junio C Hamano <gitster@pobox.com> 1542808669 +0900

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