| commit | 4fc4066c4acbf55801d52c1a84a88486f427ed48 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Aug 2022 04:52:32 +0000 (10 21:52 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Aug 2022 04:52:32 +0000 (10 21:52 -0700) | ||
| tree | 0c573785112c54e99eaa26037b7313d408ad58d9 | treesnapshot (tar.gz zip) |
| parent | 312d5b7429508cc339ae66e9d618b4308dd1d1e8 | commitdiff |
| parent | 4d35f744219335d8b32df363891b6336dcf02a6e | commitdiff |
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
"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