From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Dec 2022 02:42:07 +0000 (+0900)
Subject: Merge branch 'pg/diff-stat-unmerged-regression-fix'
X-Git-Tag: v2.40.0-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e57caee004362ee855a3bc8fc826abe251eb64f8;p=thirdparty%2Fgit.git

Merge branch 'pg/diff-stat-unmerged-regression-fix'

The output from "git diff --stat" on an unmerged path lost the
terminating LF in Git 2.39, which has been corrected.

* pg/diff-stat-unmerged-regression-fix:
  diff: fix regression with --stat and unmerged file
---

e57caee004362ee855a3bc8fc826abe251eb64f8