]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tk/p4-utf8-bom'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:54 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:54 +0000 (15:26 -0700)
"git p4" update.

* tk/p4-utf8-bom:
  git-p4: preserve utf8 BOM when importing from p4 to git

1  2 
git-p4.py

diff --cc git-p4.py
Simple merge