From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Oct 2013 19:10:21 +0000 (-0700)
Subject: Merge branch 'hn/log-graph-color-octopus'
X-Git-Tag: v1.8.5-rc0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=779503c5eb5fe822409cdf7c064a818bdc650f02;p=thirdparty%2Fgit.git

Merge branch 'hn/log-graph-color-octopus'

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

779503c5eb5fe822409cdf7c064a818bdc650f02