From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jan 2020 22:17:08 +0000 (-0800)
Subject: Merge branch 'ds/graph-horizontal-edges'
X-Git-Tag: v2.26.0-rc0~115
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d52adee7790352c96fa37558206e6db8866879d2;p=thirdparty%2Fgit.git

Merge branch 'ds/graph-horizontal-edges'

Rendering by "git log --graph" of ancestry lines leading to a merge
commit were made suboptimal to waste vertical space a bit with a
recent update, which has been corrected.

* ds/graph-horizontal-edges:
  graph: fix collapse of multiple edges
  graph: add test to demonstrate horizontal line bug
---

d52adee7790352c96fa37558206e6db8866879d2