diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-01-02 12:38:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-02 12:38:29 -0800 |
| commit | b76a244c9da0af40a0d2e123b12576fc64e6a354 (patch) | |
| tree | 35b9c65e34caf79da5fcb553d012063247a1f364 /git-merge-resolve.sh | |
| parent | Merge branch 'bk/p4-misc-usability' (diff) | |
| parent | CI: add FreeBSD CI support via Cirrus-CI (diff) | |
| download | tgif-b76a244c9da0af40a0d2e123b12576fc64e6a354.tar.xz | |
Merge branch 'em/freebsd-cirrus-ci'
* em/freebsd-cirrus-ci:
CI: add FreeBSD CI support via Cirrus-CI
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions