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