From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 27 Feb 2026 23:11:52 +0000 (-0800)
Subject: Merge branch 'ps/ci-gitlab-msvc-updates'
X-Git-Tag: v2.54.0-rc0~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62d0da86a763ab03604d75eb287776a7d639e1f;p=thirdparty%2Fgit.git

Merge branch 'ps/ci-gitlab-msvc-updates'

CI update.

* ps/ci-gitlab-msvc-updates:
  gitlab-ci: handle failed tests on MSVC+Meson job
  gitlab-ci: use "run-test-slice-meson.sh"
  ci: make test slicing consistent across Meson/Make
  github: fix Meson tests not executing at all
  meson: fix MERGE_TOOL_DIR with "--no-bin-wrappers"
  ci: don't skip smallest test slice in GitLab
  ci: handle failures of test-slice helper
---

a62d0da86a763ab03604d75eb287776a7d639e1f