diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-13 12:19:20 -0700 |
| commit | 2e72299ec66c1963836f544fe8485853807b8f28 (patch) | |
| tree | 45f26c5adfc79f7068f90a23e24a938aaeb3f15d /t/t6037-merge-ours-theirs.sh | |
| parent | Merge branch 'jk/ci-only-on-selected-branches' (diff) | |
| parent | bloom: fix `make sparse` warning (diff) | |
| download | tgif-2e72299ec66c1963836f544fe8485853807b8f28.tar.xz | |
Merge branch 'dd/bloom-sparse-fix'
Code clean-up.
* dd/bloom-sparse-fix:
bloom: fix `make sparse` warning
Diffstat (limited to 't/t6037-merge-ours-theirs.sh')
0 files changed, 0 insertions, 0 deletions