Merge branch 'mb/p4-utf16-crlf'
commit745af8c7b5506f17516e21629386191acb26aae7
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 16:16:55 +0000 (27 09:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 16:16:55 +0000 (27 09:16 -0700)
tree4cc641f92759263a97e2fe83ea40c0ed60a13c55
parent04e340b29bc51d8b220a1fe3b4a145fbd222cc6d
parent4d35f744219335d8b32df363891b6336dcf02a6e
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
git-p4.py