From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Feb 2024 00:04:32 +0000 (-0800)
Subject: Merge branch 'km/mergetool-vimdiff-layout-fallback'
X-Git-Tag: v2.45.0-rc0~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66b1160141fc9c5ea01c473aaef4e6a5c8532ec5;p=thirdparty%2Fgit.git

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
---

66b1160141fc9c5ea01c473aaef4e6a5c8532ec5