diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-02-27 16:04:32 -0800 |
| commit | 66b1160141fc9c5ea01c473aaef4e6a5c8532ec5 (patch) | |
| tree | 52a24e95c9db279df2b57b5b5ab7e4ec68a7c79c /t/unit-tests/t-basic.c | |
| parent | 03f9f1a3a24053e90de15b432b02d746fc25bb6a (diff) | |
| parent | b21d164275b9186421ebe39498be47ea9f171694 (diff) | |
Merge branch 'km/mergetool-vimdiff-layout-fallback'
Variants of vimdiff learned to honor mergetool.<variant>.layout settings.
* km/mergetool-vimdiff-layout-fallback:
mergetools: vimdiff: use correct tool's name when reading mergetool config
Diffstat (limited to 't/unit-tests/t-basic.c')
0 files changed, 0 insertions, 0 deletions