diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-08 12:44:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-08 12:44:13 -0800 |
| commit | 1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2 (patch) | |
| tree | 9cc28c86c02c4c3012a0fc04884f727eafa917e7 /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'tm/doc-submodule-absorb-fix' (diff) | |
| parent | graph: fix lack of color in horizontal lines (diff) | |
| download | tgif-1f5f3ffe5ceae12f0f7d78c42f657d9fee48fde2.tar.xz | |
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 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions