aboutsummaryrefslogtreecommitdiffstats
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-20 15:26:54 -0700
committerJunio C Hamano <gitster@pobox.com>2022-05-20 15:26:54 -0700
commit804ec0301fddb68d5170939084d79e2c0c672028 (patch)
tree2a59846b4ac9122d38675d8610543900e77806d1 /userdiff.c
parentMerge branch 'cg/vscode-with-gdb' (diff)
parentgit-p4: preserve utf8 BOM when importing from p4 to git (diff)
downloadgit-804ec0301fddb68d5170939084d79e2c0c672028.tar.gz
git-804ec0301fddb68d5170939084d79e2c0c672028.zip
Merge branch 'tk/p4-utf8-bom'
"git p4" update. * tk/p4-utf8-bom: git-p4: preserve utf8 BOM when importing from p4 to git
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions