summaryrefslogtreecommitdiffstats
path: root/notes-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-21 00:27:00 +0200
committerJunio C Hamano <gitster@pobox.com>2022-05-21 00:27:00 +0200
commit3af1df0415741c85f84e78e281339186be1d05d7 (patch)
tree4cacb837ddf6374d7312caba2fcbe2ff5a98db65 /notes-merge.c
parentMerge branch 'ep/equals-null-cocci' (diff)
parentgit-p4: improve encoding handling to support inconsistent encodings (diff)
downloadgit-3af1df0415741c85f84e78e281339186be1d05d7.tar.xz
git-3af1df0415741c85f84e78e281339186be1d05d7.zip
Merge branch 'tk/p4-metadata-coding-strategies'
"git p4" updates. * tk/p4-metadata-coding-strategies: git-p4: improve encoding handling to support inconsistent encodings
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions