From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jul 2022 16:16:55 +0000 (-0700)
Subject: Merge branch 'mb/p4-utf16-crlf'
X-Git-Tag: v2.38.0-rc0~118
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=745af8c7b5506f17516e21629386191acb26aae7;p=thirdparty%2Fgit.git

Merge branch 'mb/p4-utf16-crlf'

"git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.

* mb/p4-utf16-crlf:
  git-p4: fix CR LF handling for utf16 files
---

745af8c7b5506f17516e21629386191acb26aae7