tree 9cc28c86c02c4c3012a0fc04884f727eafa917e7
parent a4e4140ac909f0466af239fde2199a11d81bd751
parent a1087c93677bc0304c98f14915b1843e470e4a55
author Junio C Hamano <gitster@pobox.com> 1578516252 -0800
committer Junio C Hamano <gitster@pobox.com> 1578516253 -0800

Merge branch 'ds/graph-assert-fix'

Since recent updates to the log graph rendering code, drawing
certain merges started triggering an assert on a condition that
would no longer hold true, which has been corrected.

* ds/graph-assert-fix:
  graph: fix lack of color in horizontal lines
  graph: drop assert() for merge with two collapsing parents