Merge branch 'km/mergetool-vimdiff-layout-fallback'