From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Nov 2013 22:37:11 +0000 (-0800)
Subject: Merge branch 'hn/log-graph-color-octopus' into maint
X-Git-Tag: v1.8.4.3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46992b5411508b3b1a77d3178440efa77774a367;p=thirdparty%2Fgit.git

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
---

46992b5411508b3b1a77d3178440efa77774a367