On Mon, Mar 28 2022, Junio C Hamano wrote:
> * fr/vimdiff-layout (2022-03-23) 3 commits
> - vimdiff: integrate layout tests in the unit tests framework ('t' folder)
> - vimdiff: add tool documentation
> - vimdiff: new implementation with layout support
>
> Reimplement "vimdiff[123]" mergetool drivers with a more generic
> layout mechanism.
>
> Will merge to 'next'?
> source: <20220319091141.4911-1-greenfoo@xxxxxx>
I have no opinion on the topic itself (haven't looked in detail, and I
don't use vim), but FWIW I've gotthis patch to fix the 2x new warnings
on "make check-doc" it triggered:
https://lore.kernel.org/git/patch-1.1-4a5d219dfe7-20220327T131751Z-avarab@xxxxxxxxx/
It has a trivial conflict (to that same check!) with my 3e05ff3e147 (CI:
have "static-analysis" run "check-builtins", not "documentation",
2022-03-25) in seen, but perhaps worth picking up...
