summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-11-05 13:41:51 -0800
committerJunio C Hamano <gitster@pobox.com>2025-11-05 13:41:51 -0800
commit9a18a7449d72c11fee629b986e92681225b282fd (patch)
tree16c022a5cc3f976283af39d24089c536e8e299b6 /builtin/merge-tree.c
parentc8a641c5904bc55807d4bbed035ab03dbd6c10ba (diff)
parent73b9cdb7c40a675a95758d678c5c7509f98172c8 (diff)
Merge branch 'jc/ci-use-macos-14'
The version of macos image used in GitHub CI has been updated to macos-14, as the macos-13 that we have been using got deprecated. * jc/ci-use-macos-14: GitHub CI: macos-13 images are no more
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions