From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Sep 2020 22:25:42 +0000 (-0700)
Subject: Merge branch 'jk/diff-highlight-blank-match-fix'
X-Git-Tag: v2.29.0-rc0~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=033591569064cb6063b66bf9bb8ffefc0c3b9508;p=thirdparty%2Fgit.git

Merge branch 'jk/diff-highlight-blank-match-fix'

"diff-highlight" (in contrib/) had a logic to flush its output upon
seeing a blank line but the way it detected a blank line was broken.

* jk/diff-highlight-blank-match-fix:
  diff-highlight: correctly match blank lines for flush
---

033591569064cb6063b66bf9bb8ffefc0c3b9508