Re: What's cooking in git.git (Mar 2022, #07; Wed, 30)

From: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Apr 3, 2022, 20:05 UTC
Message-ID: <a5c703ed-9a75-b9e5-0103-a89741abb58f@gmail.com>
In-Reply-To: <xmqqee2i50h9.fsf@gitster.g>

Hi Junio,

Le 2022-03-30 à 22:17, Junio C Hamano a écrit :

Show 11 quoted lines

> * fr/vimdiff-layout (2022-03-30) 4 commits
>  - mergetools: add description to all diff/merge tools
>  - vimdiff: add tool documentation
>  - vimdiff: integrate layout tests in the unit tests framework ('t' folder)
>  - vimdiff: new implementation with layout support
> 
>  Reimplement "vimdiff[123]" mergetool drivers with a more generic
>  layout mechanism.
> 
>  Will merge to 'next'?
>  source: <20220330191909.294610-1-greenfoo@u92.eu>

I reviewed the documentation part of v9 which you reference here and I think it's ready to go, apart from a small typo which I just pointed out in <d01710e1-8a42-e4d1-5034-f6796372587e@gmail.com>. I'll let you judge if you want to fix that yourself :)

Cheers, Philippe.