diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-12-23 13:59:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-23 13:59:46 -0800 |
| commit | 7a5026529529e811b41de02ca12aa6c8ff3d11c5 (patch) | |
| tree | c21a12770bad4b904073dab1a93c152e609d95e2 /mergetools/kdiff3 | |
| parent | Merge branch 'dl/checkout-p-merge-base' (diff) | |
| parent | t7900-maintenance: test for magic markers (diff) | |
| download | tgif-7a5026529529e811b41de02ca12aa6c8ff3d11c5.tar.xz | |
Merge branch 'ma/maintenance-crontab-fix'
Hotfix for a topic of this cycle.
* ma/maintenance-crontab-fix:
t7900-maintenance: test for magic markers
gc: fix handling of crontab magic markers
git-maintenance.txt: add missing word
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions