]> git.99rst.org Git - git.git/commitdiff
Merge branch 'pg/diff-stat-unmerged-regression-fix'
authorJunio C Hamano <redacted>
Mon, 26 Dec 2022 02:42:07 +0000 (11:42 +0900)
committerJunio C Hamano <redacted>
Mon, 26 Dec 2022 02:42:07 +0000 (11:42 +0900)
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

1  2 
diff.c

diff --cc diff.c
Simple merge
git clone https://git.99rst.org/PROJECT