From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 15 Oct 2019 04:48:01 +0000 (+0900)
Subject: Merge branch 'dl/octopus-graph-bug'
X-Git-Tag: v2.24.0-rc0~24
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=5b900fb812f678183d2810427b8862eb7f0dc22b

Merge branch 'dl/octopus-graph-bug'

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

5b900fb812f678183d2810427b8862eb7f0dc22b