Merge branch 'hn/log-graph-color-octopus' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Nov 2013 22:37:11 +0000 (7 14:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Nov 2013 22:37:11 +0000 (7 14:37 -0800)
Coloring around octopus merges in "log --graph" output was screwy.

* hn/log-graph-color-octopus:
  graph: fix coloring around octopus merges


Trivial merge