| commit | 46992b5411508b3b1a77d3178440efa77774a367 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Nov 2013 22:37:11 +0000 (7 14:37 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 7 Nov 2013 22:37:11 +0000 (7 14:37 -0800) | ||
| tree | 158b733e6b48ad060232f26333ac2c66a5c7f2ec | treesnapshot (tar.gz zip) |
| parent | 07c55c00a56ced7dac32206dbaebbb06bf129a37 | commitdiff |
| parent | 339c17bc7690b5436ac61c996cede3d52c85b50d | commitdiff |
Merge branch 'hn/log-graph-color-octopus' into maint
Coloring around octopus merges in "log --graph" output was screwy.
* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges
Coloring around octopus merges in "log --graph" output was screwy.
* hn/log-graph-color-octopus:
graph: fix coloring around octopus merges