From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 Mar 2019 06:16:04 +0000 (+0900)
Subject: Merge branch 'jk/bisect-final-output'
X-Git-Tag: v2.22.0-rc0~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b8f4dc580432107693a780010c240c2b676ff30;p=git

Merge branch 'jk/bisect-final-output'

The final report from "git bisect" used to show the suspected
culprit using a raw "diff-tree", with which there is no output for
a merge commit.  This has been updated to use a more modern and
human readable output that still is concise enough.

* jk/bisect-final-output:
  bisect: make diff-tree output prettier
  bisect: fix internal diff-tree config loading
  bisect: use string arguments to feed internal diff-tree
---

1b8f4dc580432107693a780010c240c2b676ff30