Merge branch 'hn/log-graph-color-octopus'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:21 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 Oct 2013 19:10:21 +0000 (12:10 -0700)
commit779503c5eb5fe822409cdf7c064a818bdc650f02
tree0ef387f1e66ddfbe4bde85b2dbdaa4281c24ee86
parentf101b888f278ca6ceaeef11fbee72c29e6dd9237
parent339c17bc7690b5436ac61c996cede3d52c85b50d
Merge branch 'hn/log-graph-color-octopus'

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