diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-01-08 20:44:12 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-01-08 20:44:13 (GMT) |
commit | 1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2 (patch) | |
tree | 9cc28c86c02c4c3012a0fc04884f727eafa917e7 /send-pack.c | |
parent | a4e4140ac909f0466af239fde2199a11d81bd751 (diff) | |
parent | a1087c93677bc0304c98f14915b1843e470e4a55 (diff) | |
download | git-1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2.zip git-1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2.tar.gz git-1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2.tar.bz2 |
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
Diffstat (limited to 'send-pack.c')
0 files changed, 0 insertions, 0 deletions