summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-02-10 16:48:07 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-10 16:48:07 -0800
commitc6102b758572c7515f606b2423dfe38934fe6764 (patch)
treeaf165be4a97c85359ed4ced1fab5ec5acbc29bc4 /Documentation/git-mergetool.txt
parentThe seventh batch (diff)
parent.github/workflows/main.yml: run static-analysis on bionic (diff)
downloadtgif-c6102b758572c7515f606b2423dfe38934fe6764.tar.xz
Merge branch 'tb/ci-run-cocci-with-18.04'
The version of Ubuntu Linux used by default at GitHub Actions CI has been updated to one that lack coccinelle; until it gets fixed, work it around by sticking to the previous release (18.04). * tb/ci-run-cocci-with-18.04: .github/workflows/main.yml: run static-analysis on bionic
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions