diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:19:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-11 14:19:03 -0700 |
| commit | 18fd96f1d706357704c8d51f12b9412cd424ac49 (patch) | |
| tree | eae41a4b0201011c458a4504ae4906d6c30c5cda /builtin/merge.c | |
| parent | Merge branch 'sg/ref-filter-parse-optim' into maint (diff) | |
| parent | graph: fix extra spaces in graph_padding_line (diff) | |
| download | tgif-18fd96f1d706357704c8d51f12b9412cd424ac49.tar.xz | |
Merge branch 'jk/graph-padding-fix' into maint
The "graph" API used in "git log --graph" miscounted the number of
output columns consumed so far when drawing a padding line, which
has been fixed; this did not affect any existing code as nobody
tried to write anything after the padding on such a line, though.
* jk/graph-padding-fix:
graph: fix extra spaces in graph_padding_line
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions