Merge branch 'jk/graph-padding-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)
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

1  2 
graph.c
diff --cc graph.c
Simple merge