From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Aug 2022 04:52:32 +0000 (-0700)
Subject: Merge branch 'mb/p4-utf16-crlf' into maint
X-Git-Tag: v2.37.2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fc4066c4acbf55801d52c1a84a88486f427ed48;p=thirdparty%2Fgit.git

Merge branch 'mb/p4-utf16-crlf' into maint

"git p4" working on UTF-16 files on Windows did not implement
CRLF-to-LF conversion correctly, which has been corrected.
source: <pull.1294.v2.git.git.1658341065221.gitgitgadget@gmail.com>

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

4fc4066c4acbf55801d52c1a84a88486f427ed48