From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Jan 2020 20:44:12 +0000 (-0800)
Subject: Merge branch 'ds/graph-assert-fix'
X-Git-Tag: v2.25.0-rc2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2;p=thirdparty%2Fgit.git

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

1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2