]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'km/mergetool-vimdiff-layout-fallback'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2024 00:04:32 +0000 (16:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2024 00:04:32 +0000 (16:04 -0800)
commit66b1160141fc9c5ea01c473aaef4e6a5c8532ec5
tree52a24e95c9db279df2b57b5b5ab7e4ec68a7c79c
parent03f9f1a3a24053e90de15b432b02d746fc25bb6a
parentb21d164275b9186421ebe39498be47ea9f171694
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