]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mb/p4-utf16-crlf'
authorJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 16:16:55 +0000 (09:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 27 Jul 2022 16:16:55 +0000 (09:16 -0700)
"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

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge