diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-20 08:33:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-20 08:33:28 -0700 |
| commit | 55df1a69d76ec32553419adf9f8285f26cec964d (patch) | |
| tree | e4bd7aa54337782c84643af245b9468f39261a02 /builtin/merge-ours.c | |
| parent | Merge branch 'en/merge-rename-rename-worktree-fix' (diff) | |
| parent | ci: avoid pounding on the poor ci-artifacts container (diff) | |
| download | tgif-55df1a69d76ec32553419adf9f8285f26cec964d.tar.xz | |
Merge branch 'js/ci-sdk-download-fix'
Instead of downloading Windows SDK for CI jobs for windows builds
from an external site (wingit.blob.core.windows.net), use the one
created in the windows-build job, to work around quota issues at
the external site.
* js/ci-sdk-download-fix:
ci: avoid pounding on the poor ci-artifacts container
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions