From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Oct 2019 02:42:14 +0000 (+0900)
Subject: Merge branch 'dl/octopus-graph-bug' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6bc2fe4a0ea72bd2732e5f3f80f35ac3b95f785;p=git

Merge branch 'dl/octopus-graph-bug' into next

"git log --graph" for an octopus merge is sometimes colored
incorrectly, which is demonstrated and documented but not yet
fixed.

* dl/octopus-graph-bug:
  t4214: demonstrate octopus graph coloring failure
  t4214: explicitly list tags in log
  t4214: generate expect in their own test cases
  t4214: use test_merge
  test-lib: let test_merge() perform octopus merges
---

c6bc2fe4a0ea72bd2732e5f3f80f35ac3b95f785