From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Aug 2020 23:14:49 +0000 (-0700)
Subject: Merge branch 'jk/blame-coalesce-fix'
X-Git-Tag: v2.29.0-rc0~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93121dfd8c1aaed387fe4d5af7597cf0a675199b;p=thirdparty%2Fgit.git

Merge branch 'jk/blame-coalesce-fix'

When given more than one target line ranges, "git blame -La,b
-Lc,d" was over-eager to coalesce groups of original lines and
showed incorrect results, which has been corrected.

* jk/blame-coalesce-fix:
  blame: only coalesce lines that are adjacent in result
  t8003: factor setup out of coalesce test
  t8003: check output of coalesced blame
---

93121dfd8c1aaed387fe4d5af7597cf0a675199b