diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:28 -0800 |
| commit | b778c1eef50e001807aa723bdc9cb2685a59db0f (patch) | |
| tree | 97c42eaf1fe593325d27c6b1173b0a0ea7c1f390 /Documentation/config/mergetool.txt | |
| parent | Merge branch 'jt/packfile-as-uri-doc' into maint (diff) | |
| parent | SKIP_DASHED_BUILT_INS: respect `config.mak` (diff) | |
| download | tgif-b778c1eef50e001807aa723bdc9cb2685a59db0f.tar.xz | |
Merge branch 'js/skip-dashed-built-ins-from-config-mak' into maint
Build fix.
* js/skip-dashed-built-ins-from-config-mak:
SKIP_DASHED_BUILT_INS: respect `config.mak`
Diffstat (limited to 'Documentation/config/mergetool.txt')
0 files changed, 0 insertions, 0 deletions