Re: [PATCH v2] mergetools: vimdiff: use correct tool's name when reading mergetool config

From: Fernando Ramos <greenfoo@u92.eu>
Date: Feb 15, 2024, 20:43 UTC
Message-ID: <Zc53XnK1TJVQNjOK@zacax395.localdomain>
In-Reply-To: <20240215142002.36870-1-kipras@kipras.org>

On 24/02/15 04:20PM, Kipras Melnikovas wrote:

Show 5 quoted lines

> The /mergetools/vimdiff script, which handles both vimdiff, nvimdiff
> and gvimdiff mergetools (the latter 2 simply source the vimdiff script), has a
> function merge_cmd() which read the layout variable from git config, and it
> would always read the value of mergetool.**vimdiff**.layout, instead of the
> mergetool being currently used (vimdiff or nvimdiff or gvimdiff).

You are 100% right. I completely overlooked this detail in the original implementation.

Thanks for the fix!