]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mb/p4-utf16-crlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 11 Aug 2022 04:52:32 +0000 (21:52 -0700)
"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


Trivial merge