summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-05 10:43:04 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-05 10:43:04 -0800
commit0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d (patch)
tree3f8b9c871ee77448710e5e6b7f1064844c4a8dd0 /git-mergetool.sh
parentMerge branch 'be/describe-multiroot' (diff)
parentAzure Pipeline: switch to the latest agent pools (diff)
downloadtgif-0108fc1b46e4ff2cdad9edd18c5c0d1b459d7a9d.tar.xz
Merge branch 'js/ci-windows-update'
Updates to the CI settings. * js/ci-windows-update: Azure Pipeline: switch to the latest agent pools ci: prevent `perforce` from being quarantined t/lib-httpd: avoid using macOS' sed
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions